Do not merge previous values in pillar include loop.

This commit is contained in:
Matthias Erll 2015-10-28 16:27:04 +01:00
parent 3942b4d0e6
commit a42c51f9bf

View file

@ -522,17 +522,17 @@ class Pillar(object):
mods,
defaults
)
if nstate:
if key:
nstate = {
key: nstate
}
if nstate:
if key:
nstate = {
key: nstate
}
state = merge(
state,
nstate,
self.merge_strategy,
self.opts.get('renderer', 'yaml'))
state = merge(
state,
nstate,
self.merge_strategy,
self.opts.get('renderer', 'yaml'))
if err:
errors += err