Merge pull request #73 from mkotsbak/fix_relative_references

noelmcloughlin · web-flow · commit e4e6b28b5d26 · 2018-06-08T15:17:45.000+01:00
Make formula relative to actual directory by using 'tpldir'
diff --git a/haproxy/config.sls b/haproxy/config.sls
@@ -1,4 +1,4 @@
-{% from "haproxy/map.jinja" import haproxy with context %}
+{% from tpldir ~ "/map.jinja" import haproxy with context %}
 
 {% set config_file = salt['pillar.get']('haproxy:config_file_path', haproxy.config_file) %}
 haproxy.config:
diff --git a/haproxy/install.sls b/haproxy/install.sls
@@ -1,4 +1,4 @@
-{% from "haproxy/map.jinja" import haproxy with context %}
+{% from tpldir ~ "/map.jinja" import haproxy with context %}
 
 haproxy.install:
   pkg.installed:
diff --git a/haproxy/service.sls b/haproxy/service.sls
@@ -1,4 +1,4 @@
-{% from "haproxy/map.jinja" import haproxy with context %}
+{% from tpldir ~ "/map.jinja" import haproxy with context %}
 
 haproxy.service:
 {% if salt['pillar.get']('haproxy:enable', True) %}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% from "haproxy/map.jinja" import haproxy with context %}`
	`1`	`+{% from tpldir ~ "/map.jinja" import haproxy with context %}`
`2`	`2`
`3`	`3`	`{% set config_file = salt['pillar.get']('haproxy:config_file_path', haproxy.config_file) %}`
`4`	`4`	`haproxy.config:`