valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only apply master centric options without minion data merge

Browse Source 
Fix #8271
This commit is contained in:
Thomas S Hatch 2013-12-27 11:17:32 -07:00
parent 4607d38cd4
commit 2f39e976d0
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

@ -529,8 +529,9 @@ class Single(object):
self.opts,
self.id,
**self.target)
default_opts = pre_wrapper['test.opts_pkg']()
opts_pkg = dict(default_opts.items() + self.opts.items())
opts_pkg = pre_wrapper['test.opts_pkg']()
opts_pkg['file_roots'] = self.opts['file_roots']
opts_pkg['pillar_roots'] = self.opts['pillar_roots']
pillar = salt.pillar.Pillar(
opts_pkg,
opts_pkg['grains'],