Merge pull request #32288 from terminalmage/issue18429

use dictupdate.merge instead of dict.update to merge CLI pillar overrides
saltstack · Apr 1, 2016 · 42a25f6 · 42a25f6
2 parents 3e374e7 + db31732
commit 42a25f6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py
@@ -723,7 +723,13 @@ def ext_pillar(self, pillar, pillar_dirs, errors=None):
             return pillar, errors
         ext = None
         # Bring in CLI pillar data
-        pillar.update(self.pillar_override)
+        if self.pillar_override and isinstance(self.pillar_override, dict):
+            pillar = merge(pillar,
+                           self.pillar_override,
+                           self.merge_strategy,
+                           self.opts.get('renderer', 'yaml'),
+                           self.opts.get('pillar_merge_lists', False))
+
         for run in self.opts['ext_pillar']:
             if not isinstance(run, dict):
                 errors.append('The "ext_pillar" option is malformed')
@@ -802,6 +808,14 @@ def compile_pillar(self, ext=True, pillar_dirs=None):
             for error in errors:
                 log.critical('Pillar render error: {0}'.format(error))
             pillar['_errors'] = errors
+
+        if self.pillar_override and isinstance(self.pillar_override, dict):
+            pillar = merge(pillar,
+                           self.pillar_override,
+                           self.merge_strategy,
+                           self.opts.get('renderer', 'yaml'),
+                           self.opts.get('pillar_merge_lists', False))
+
         return pillar
 
 

diff --git a/salt/state.py b/salt/state.py
@@ -649,8 +649,6 @@ def _gather_pillar(self):
                 pillarenv=self.opts.get('pillarenv')
                 )
         ret = pillar.compile_pillar()
-        if self._pillar_override and isinstance(self._pillar_override, dict):
-            ret.update(self._pillar_override)
         return ret
 
     def _mod_init(self, low):