fix(jinja): don't call pillar.get

saltstack-formulas · Jul 13, 2019 · 33b98f5 · 33b98f5
1 parent 4a1f9ed
commit 33b98f5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/openvpn/config.sls b/openvpn/config.sls
@@ -42,6 +42,7 @@ openvpn_config_{{ type }}_{{ name }}:
         type: {{ type }}
         user: {{ map.user }}
         group: {{ map.group }}
+        config: {{ config | json }}
     - watch_in:
       - service: {{ service_id }}
 

diff --git a/openvpn/files/client.jinja b/openvpn/files/client.jinja
@@ -3,7 +3,6 @@
 # Template: {{ source }}
 
 {% include 'openvpn/files/common_opts.jinja' %}
-{%- set config = salt['pillar.get']("openvpn:{}:{}".format(type, name), {}) %}
 
 {%- if not (config.pull is defined and config.pull == False) %}
 pull

diff --git a/openvpn/files/common_opts.jinja b/openvpn/files/common_opts.jinja
@@ -1,5 +1,4 @@
 {% from "openvpn/map.jinja" import multipart_param with context %}
-{%- set config = salt['pillar.get']("openvpn:{}:{}".format(type, name), {}) %}
 
 {%- if config.daemon is defined and config.daemon == True %}
 daemon