Merge pull request #251 from myii/PR_tpldir

Maintain consistent use of `tpldir` (continues from #211)
saltstack-formulas · Jan 24, 2019 · 31fb296 · 31fb296
2 parents d536482 + 02cde57
commit 31fb296
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/postgres/client/remove.sls b/postgres/client/remove.sls
@@ -1,4 +1,4 @@
-{%- from "postgres/map.jinja" import postgres with context -%}
+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 #remove release installed by formula
 postgresql-client-removed:

diff --git a/postgres/dev/remove.sls b/postgres/dev/remove.sls
@@ -1,4 +1,4 @@
-{%- from "postgres/map.jinja" import postgres with context -%}
+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 # remove release installed by formula
 postgresql-devel-removed:

diff --git a/postgres/server/remove.sls b/postgres/server/remove.sls
@@ -1,4 +1,4 @@
-{%- from "postgres/map.jinja" import postgres with context %}
+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 postgresql-dead:
   service.dead: