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 #39862 from rallytime/bp-38943

Browse source 
Back-port #38943 to 2016.11
This commit is contained in:
Mike Place 2017-03-06 20:34:39 -07:00 • committed by GitHub
commit 49c8faa141
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/client/ssh/__init__.py
View file

@ -901,9 +901,11 @@ class Single(object):
opts_pkg['id'] = self.id
retcode = 0
popts = {}
popts.update(opts_pkg['__master_opts__'])
popts.update(opts_pkg)
pillar = salt.pillar.Pillar(
opts_pkg,
popts,
opts_pkg['grains'],
opts_pkg['id'],
opts_pkg.get('environment', 'base')