Merge pull request #251 from myii/PR_tpldir

aboe76 · web-flow · commit 31fb296ee237 · 2019-01-24T20:10:52.000+01:00
Maintain consistent use of `tpldir` (continues from #211)
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:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{%- from "postgres/map.jinja" import postgres with context -%}`
	`1`	`+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}`
`2`	`2`
`3`	`3`	`#remove release installed by formula`
`4`	`4`	`postgresql-client-removed:`