valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16725 from thatch45/ssh_ext_pillar

Browse Source 
salt-ssh ext_pillar is a go!
This commit is contained in:
Thomas S Hatch 2014-10-17 13:31:56 -06:00
commit 5a00ba04d2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/client/ssh/__init__.py
View File

@ -665,6 +665,7 @@ class Single(object):
opts_pkg = pre_wrapper['test.opts_pkg']()
opts_pkg['file_roots'] = self.opts['file_roots']
opts_pkg['pillar_roots'] = self.opts['pillar_roots']
opts_pkg['ext_pillar'] = self.opts['ext_pillar']
if '_caller_cachedir' in self.opts:
opts_pkg['_caller_cachedir'] = self.opts['_caller_cachedir']
else:
@ -683,8 +684,8 @@ class Single(object):
opts_pkg['id'],
opts_pkg.get('environment', 'base')
)
pillar_data = pillar.compile_pillar()
pillar_dirs = {}
pillar_data = pillar.compile_pillar(pillar_dirs=pillar_dirs)
# TODO: cache minion opts in datap in master.py
data = {'opts': opts_pkg,