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

Bring salt-ssh pillar.get in line with mainline pillar.get

Browse source 
Fixes #22131
This commit is contained in:
Colton Myers 2015-05-18 15:54:07 -06:00
parent aee00c83df
commit bc84502f46
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
salt/client/ssh/wrapper/pillar.py
View file

@ -2,12 +2,15 @@
'''
Extract the pillar data for this minion
'''
# Import python libs
import collections
# Import salt libs
import salt.pillar
import salt.utils
def get(key, default=''):
def get(key, default='', merge=False, delimiter=':'):
'''
.. versionadded:: 0.14
@ -24,13 +27,33 @@ def get(key, default=''):
pkg:apache
merge
Specify whether or not the retrieved values should be recursively
merged into the passed default.
.. versionadded:: 2015.5.1
delimiter
Specify an alternate delimiter to use when traversing a nested dict
.. versionadded:: 2015.5.1
CLI Example:
.. code-block:: bash
salt '*' pillar.get pkg:apache
'''
return salt.utils.traverse_dict_and_list(__pillar__, key, default)
if merge:
ret = salt.utils.traverse_dict_and_list(__pillar__, key, {}, delimiter)
if isinstance(ret, collections.Mapping) and \
isinstance(default, collections.Mapping):
return salt.utils.dictupdate.update(default, ret)
return salt.utils.traverse_dict_and_list(__pillar__,
key,
default,
delimiter)
def item(*args):