Merge remote branch 'upstream/develop' into develop

This commit is contained in:
Forrest Alvarez 2013-11-16 06:59:58 +00:00
commit 34ea2ccf50
2 changed files with 13 additions and 2 deletions

View File

@ -51,6 +51,11 @@ def set(filename, section, parameter, value):
value
The value to set
CLI Example:
.. code-block:: bash
salt-call openstack_config.set /etc/keystone/keystone.conf sql connection foo
'''
filename = _quote(filename)
@ -87,6 +92,7 @@ def get(filename, section, parameter):
CLI Example:
.. code-block:: bash
salt-call openstack_config.get /etc/keystone/keystone.conf sql connection
'''
@ -121,6 +127,11 @@ def delete(filename, section, parameter):
parameter
The parameter to delete
CLI Example:
.. code-block:: bash
salt-call openstack_config.delete /etc/keystone/keystone.conf sql connection
'''
filename = _quote(filename)

View File

@ -26,7 +26,7 @@ def __virtual__():
return 'openstack_config'
def present(name, filename, section, value, parameter = None):
def present(name, filename, section, value, parameter=None):
'''
Ensure a value is set in an OpenStack configuration file.
@ -73,7 +73,7 @@ def present(name, filename, section, value, parameter = None):
'comment': 'The value has been updated'}
def absent(name, filename, section, parameter = None):
def absent(name, filename, section, parameter=None):
'''
Ensure a value is not set in an OpenStack configuration file.