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

Merge pull request #39028 from terminalmage/clarify-delimiter-argument

Browse source 
Clarify delimiter argument
This commit is contained in:
Mike Place 2017-01-30 11:20:25 -07:00 • committed by GitHub
commit 5b09dc4198
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/grains.py
View file

@ -89,7 +89,9 @@ def get(key, default='', delimiter=DEFAULT_TARGET_DELIM):
:param delimiter:
Specify an alternate delimiter to use when traversing a nested dict
Specify an alternate delimiter to use when traversing a nested dict.
This is useful for when the desired key contains a colon. See CLI
example below for usage.
.. versionadded:: 2014.7.0
@ -98,6 +100,7 @@ def get(key, default='', delimiter=DEFAULT_TARGET_DELIM):
.. code-block:: bash
salt '*' grains.get pkg:apache
salt '*' grains.get abc::def|ghi delimiter='|'
'''
return salt.utils.traverse_dict_and_list(__grains__,
key,

5
salt/modules/pillar.py
View file

@ -55,7 +55,9 @@ def get(key,
.. versionadded:: 2014.7.0
delimiter
Specify an alternate delimiter to use when traversing a nested dict
Specify an alternate delimiter to use when traversing a nested dict.
This is useful for when the desired key contains a colon. See CLI
example below for usage.
.. versionadded:: 2014.7.0
@ -80,6 +82,7 @@ def get(key,
.. code-block:: bash
salt '*' pillar.get pkg:apache
salt '*' pillar.get abc::def|ghi delimiter='|'
'''
if not __opts__.get('pillar_raise_on_missing'):
if default is KeyError: