Temporary workaround for saltstack#27901

DSRCorporation · Oct 13, 2015 · ec0e25c · ec0e25c
1 parent b5e39f9
commit ec0e25c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/salt/loader.py b/salt/loader.py
@@ -1055,7 +1055,11 @@ def __prep_mod_opts(self, opts):
         Strip out of the opts any logger instance
         '''
         self._grains = DictThread.wrap(opts.get('grains', {}), 'grains')
-        self._pillar = DictThread.wrap(opts.get('pillar', {}), 'pillar')
+        # TODO: temporary workaround, see #27901
+        pillar = opts.get('pillar', {})
+        if isinstance(pillar, bool):
+            pillar = {}
+        self._pillar = DictThread.wrap(pillar, 'pillar')
 
         mod_opts = {}
         for key, val in list(opts.items()):