fix(jinja): fix generated iscsi.conf

saltstack-formulas · Oct 5, 2019 · 1def94b · 1def94b
1 parent 1645c53
commit 1def94b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/iscsi/initiator/config/files/default/iscsi.tmpl b/iscsi/initiator/config/files/default/iscsi.tmpl
@@ -16,6 +16,7 @@
 {%- if value is mapping %}
 {{shift}}{{ key }} {  # nickname
 {{ readconf(value, spaces|int+4) }}
+}
 {%- elif value is string or value is number %}
 {{shift}}{{ key }} = {{"'" if value is not string else ''}}{{ value }}{{"'" if value is not string else ''}}
 {% endif %}

diff --git a/iscsi/initiator/config/files/default/open-iscsi.tmpl b/iscsi/initiator/config/files/default/open-iscsi.tmpl
@@ -13,8 +13,8 @@
 
 {%- macro openiscsi(key, value, spaces=0) -%}
   {%- set shift = spaces * ' ' -%}
-{{shift}}{{ key }} = {{"'" if value is not string else ''}}{{ value }}{{"'" if value is not string else ''}}
-{%- endmacro -%}
+{{shift}}{{ key }} = {{ value ~ '\n' if value is string else '"' ~ value ~ '"\n' }}
+{%- endmacro %}
 
 {{ readconf(data,  0) }}