Merge pull request #47 from jle35/master

fix(slspath): replace slspath by tpl_root
saltstack-formulas · Mar 11, 2020 · 1f4aaed · 1f4aaed
2 parents bddbaa2 + 28d5a07
commit 1f4aaed
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/consul/config.sls b/consul/config.sls
@@ -1,4 +1,5 @@
-{%- from slspath + '/map.jinja' import consul with context -%}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot + '/map.jinja' import consul with context -%}
 
 consul-config:
   file.serialize:

diff --git a/consul/init.sls b/consul/init.sls
@@ -1,9 +1,10 @@
+{%- set tplroot = tpldir.split('/')[0] %}
 {%- if pillar.get('consul', {}).get('enabled', True) %}
-{% from slspath+"/map.jinja" import consul with context %}
+{% from tplroot+"/map.jinja" import consul with context %}
 
 include:
-  - {{ slspath }}.install
-  - {{ slspath }}.config
-  - {{ slspath }}.service
+  - {{ tplroot }}.install
+  - {{ tplroot }}.config
+  - {{ tplroot }}.service
 
 {%- endif %}
diff --git a/consul/install.sls b/consul/install.sls
@@ -1,4 +1,5 @@
-{%- from slspath + '/map.jinja' import consul with context -%}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot + '/map.jinja' import consul with context -%}
 
 consul-dep-unzip:
   pkg.installed:

diff --git a/consul/map.jinja b/consul/map.jinja
@@ -1,4 +1,5 @@
-{% import_yaml slspath+"/defaults.yaml" as defaults %}
+{%- set tplroot = tpldir.split('/')[0] %}
+{% import_yaml tplroot+"/defaults.yaml" as defaults %}
 
 {% set consul = salt['pillar.get']('consul', default=defaults.consul, merge=True) %}
 

diff --git a/consul/service.sls b/consul/service.sls
@@ -1,4 +1,5 @@
-{%- from slspath+"/map.jinja" import consul with context -%}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot+"/map.jinja" import consul with context -%}
 
 consul-init-env:
   file.managed:
@@ -18,19 +19,19 @@ consul-init-env:
 consul-init-file:
   file.managed:
     {%- if salt['test.provider']('service').startswith('systemd') %}
-    - source: salt://{{ slspath }}/files/consul.service
+    - source: salt://{{ tplroot }}/files/consul.service
     - name: /etc/systemd/system/consul.service
     - template: jinja
     - context:
         user: {{ consul.user }}
         group: {{ consul.group }}
     - mode: 0644
     {%- elif salt['test.provider']('service') == 'upstart' %}
-    - source: salt://{{ slspath }}/files/consul.upstart
+    - source: salt://{{ tplroot }}/files/consul.upstart
     - name: /etc/init/consul.conf
     - mode: 0644
     {%- else %}
-    - source: salt://{{ slspath }}/files/consul.sysvinit
+    - source: salt://{{ tplroot }}/files/consul.sysvinit
     - name: /etc/init.d/consul
     - mode: 0755
     {%- endif %}