Merge pull request #23549 from vr-jack/develop

Update __init__.py
saltstack · May 12, 2015 · e91e229 · e91e229
2 parents d198891 + 3c0a087
commit e91e229
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py
@@ -283,7 +283,8 @@ def get_tops(self):
                                 ),
                             self.rend,
                             self.opts['renderer'],
-                            self.opts['environment']
+                            self.opts['environment'],
+                            _pillar_rend=True
                             )
                         ]
             else:
@@ -298,7 +299,8 @@ def get_tops(self):
                                     top,
                                     self.rend,
                                     self.opts['renderer'],
-                                    saltenv=saltenv
+                                    saltenv=saltenv,
+                                    _pillar_rend=True
                                     )
                                 )
         except Exception as exc:
@@ -335,7 +337,8 @@ def get_tops(self):
                                         ).get('dest', False),
                                     self.rend,
                                     self.opts['renderer'],
-                                    saltenv=saltenv
+                                    saltenv=saltenv,
+                                    _pillar_rend=True
                                     )
                                 )
                     except Exception as exc: