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 instead of update pillar overrides

Browse source 
An earlier commit (made in develop the 2015.8 release branch was
created) added the ability to decrypt CLI pillar overrides. As this was
an entirely new block of code in the 2016.3 release branch, when a CLI
pillar override issue was fixed in 2015.8, the fix did not make it to
2016.3.

This commit fixes this issue by merging the CLI pillar data instead of
using dict.update().

Resolves #33647.
This commit is contained in:
Erik Johnson 2016-06-03 16:05:14 -05:00
parent 78966f5f30
commit 914003c995
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/state.py
View file

@ -30,6 +30,7 @@ import salt.loader
import salt.minion
import salt.pillar
import salt.fileclient
import salt.utils.dictupdate
import salt.utils.event
import salt.utils.url
import salt.syspaths as syspaths
@ -694,8 +695,21 @@ class State(object):
)
ret = pillar.compile_pillar()
if self._pillar_override:
merge_strategy = self.opts.get(
'pillar_source_merging_strategy',
'smart'
)
merge_lists = self.opts.get(
'pillar_merge_lists',
False
)
if isinstance(self._pillar_override, dict):
ret.update(self._decrypt_pillar_override())
ret = salt.utils.dictupdate.merge(
ret,
self._decrypt_pillar_override(),
strategy=merge_strategy,
merge_lists=merge_lists
)
else:
decrypted = yamlloader.load(
self._decrypt_pillar_override(),
@ -706,7 +720,12 @@ class State(object):
'Decrypted pillar data did not render to a dictionary'
)
else:
ret.update(decrypted)
ret = salt.utils.dictupdate.merge(
ret,
decrypted,
strategy=merge_strategy,
merge_lists=merge_lists
)
return ret
def _mod_init(self, low):