saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

grains state and module: fix version strings

Browse source
This commit is contained in:
Christophe Drevet-Droguet 2015-09-15 17:51:50 +02:00 • committed by rallytime
parent eee2318873
commit 25e9a5c9ad
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/grains.py
View file

@ -342,7 +342,7 @@ def remove(key, val, delimiter=DEFAULT_TARGET_DELIM):
specify the delimiter you use.
You can now append values to a list in nested dictionnary grains. If the
list doesn't exist at this level, it will be created.
.. versionadded:: FIXME
.. versionadded:: Boron
CLI Example:

18
salt/states/grains.py
View file

@ -19,7 +19,7 @@ def present(name, value, delimiter=DEFAULT_TARGET_DELIM, force=False):
'''
Ensure that a grain is set
.. versionchanged:: FIXME
.. versionchanged:: Boron
name
The grain name
@ -29,10 +29,10 @@ def present(name, value, delimiter=DEFAULT_TARGET_DELIM, force=False):
:param force: If force is True, the existing grain will be overwritten
regardless of its existing or provided value type. Defaults to False
.. versionadded:: FIXME
.. versionadded:: Boron
:param delimiter: A delimiter different from the default can be provided.
.. versionadded:: FIXME
.. versionadded:: Boron
It is now capable to set a grain to a complex value (ie. lists and dicts)
and supports nested grains as well.
@ -97,7 +97,7 @@ def list_present(name, value, delimiter=DEFAULT_TARGET_DELIM):
The value is present in the list type grain.
:param delimiter: A delimiter different from the default can be provided.
.. versionadded:: FIXME
.. versionadded:: Boron
The grain should be `list type <http://docs.python.org/2/tutorial/datastructures.html#data-structures>`_
@ -179,7 +179,7 @@ def list_absent(name, value, delimiter=DEFAULT_TARGET_DELIM):
The value to delete from the grain list.
:param delimiter: A delimiter different from the default can be provided.
.. versionadded:: FIXME
.. versionadded:: Boron
The grain should be `list type <http://docs.python.org/2/tutorial/datastructures.html#data-structures>`_
@ -248,12 +248,12 @@ def absent(name,
:param force: If force is True, the existing grain will be overwritten
regardless of its existing or provided value type. Defaults to False
.. versionadded:: FIXME
.. versionadded:: Boron
:param delimiter: A delimiter different from the default can be provided.
.. versionadded:: FIXME
.. versionadded:: Boron
.. versionchanged:: FIXME
.. versionchanged:: Boron
This state now support nested grains and complex values. It is also more
conservative: if a grain has a value that is a list or a dict, it will
not be removed unless the `force` parameter is True.
@ -339,7 +339,7 @@ def append(name, value, convert=False,
is given. Defaults to False.
:param delimiter: A delimiter different from the default can be provided.
.. versionadded:: FIXME
.. versionadded:: Boron
.. code-block:: yaml