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 #23595 from rallytime/bp-23549

Browse source 
Backport #23549 to 2014.7
This commit is contained in:
Thomas S Hatch 2015-05-12 15:19:40 -06:00
commit f20c0e42ce
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/pillar/__init__.py
View file

@ -214,7 +214,8 @@ class Pillar(object):
),
self.rend,
self.opts['renderer'],
self.opts['environment']
self.opts['environment'],
_pillar_rend=True
)
]
else:
@ -227,7 +228,8 @@ class Pillar(object):
),
self.rend,
self.opts['renderer'],
saltenv=saltenv
saltenv=saltenv,
_pillar_rend=True
)
)
except Exception as exc:
@ -262,7 +264,8 @@ class Pillar(object):
).get('dest', False),
self.rend,
self.opts['renderer'],
saltenv=saltenv
saltenv=saltenv,
_pillar_rend=True
)
)
except Exception as exc: