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

alxwr · alxwr · commit 33b98f53cb4d · 2019-07-13T18:01:23.000+02:00
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

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{% from "openvpn/map.jinja" import multipart_param with context %}`
`2`		`-{%- set config = salt['pillar.get']("openvpn:{}:{}".format(type, name), {}) %}`
`3`	`2`
`4`	`3`	`{%- if config.daemon is defined and config.daemon == True %}`
`5`	`4`	`daemon`