Merge pull request #16272 from rallytime/bp-16252

Backport #16252 to 2014.7

salt/utils/templates.py

@@ -55,6 +55,19 @@ def wrap_tmpl_func(render_str):
         # We want explicit context to overwrite the **kws
         kws.update(context)
         context = kws
+        assert 'opts' in context
+        assert 'saltenv' in context
+
+        if 'sls' in context:
+            slspath = context['sls'].replace('.', '/')
+            if tmplpath is not None:
+                context['tplpath'] = tmplpath
+                if not tmplpath.lower().replace('\\', '/').endswith('/init.sls'):
+                    slspath = os.path.dirname(slspath)
+            context['slsdotpath'] = slspath.replace('/', '.')
+            context['slscolonpath'] = slspath.replace('/', ':')
+            context['sls_path'] = slspath.replace('/', '_')
+            context['slspath'] = slspath
 
         if isinstance(tmplsrc, string_types):
             if from_str:

tests/unit/stateconf_test.py

@@ -268,6 +268,17 @@ G:
             list('ABCDEFG')
         )
 
+    def test_slsdir(self):
+        result = render_sls('''
+formula/woot.sls:
+  cmd.run:
+    - name: echo {{ slspath }}
+    - cwd: /
+''', sls='formula.woot', argline='yaml . jinja')
+
+        r = result['formula/woot.sls']['cmd.run'][0]['name']
+        self.assertEqual(r, 'echo formula/woot')
+
 
 if __name__ == '__main__':
     from integration import run_tests