Merge pull request #29 from noelmcloughlin/fixconf

fix(config): fix jinja; only create conf files if pillar data

Author: aboe76

iscsi/init.sls

@@ -2,7 +2,7 @@
 # vim: ft=sls
 
 include:
-         {%- if grains.os_family in ('SArch',) %}
+         {%- if grains.os_family in ('Arch',) %}
              {# This sequence avoids /etc/isns/isnsd.conf conflict on Arch #}
   - iscsi.initiator
   - iscsi.target

iscsi/initiator/config/clean.sls

@@ -6,6 +6,8 @@
 {%- set sls_package_clean = tplroot ~ '.initiator.package.clean' %}
 {%- from tplroot ~ "/map.jinja" import iscsi with context %}
 
+    {%- if iscsi.config.data[iscsi.initiator.provider|string] %}
+
 include:
   - {{ sls_package_clean }}
 
@@ -14,3 +16,5 @@ iscsi-initiator-config-clean-file-absent:
     - name: {{ iscsi.config.name[iscsi.initiator.provider|string] }}
     - watch_in:
         - sls: {{ sls_package_clean }}
+
+    {%- endif %}

iscsi/initiator/config/files/default/iscsi.tmpl

@@ -16,9 +16,10 @@
 {%- 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 %}
+{% endif %}
 {%- endmacro -%}
 
 {{ readconf(data,  0) }}

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) }}
 

iscsi/initiator/config/install.sls

@@ -4,15 +4,18 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_install = tplroot ~ '.initiator.service.install' %}
+{%- set sls_package_install = tplroot ~ '.initiator.package.install' %}
 {%- from tplroot ~ "/map.jinja" import iscsi with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
+    {%- if iscsi.config.data[iscsi.initiator.provider|string] %}
+
 include:
   - {{ sls_service_install }}
+  - {{ sls_package_install }}
 
 iscsi-initiator-config-install-file-managed:
   file.managed:
-    - onlyif: {{ iscsi.config.data[iscsi.initiator.provider|string]|json }}
     - name: {{ iscsi.config.name[iscsi.initiator.provider] }}
     - source: {{ files_switch([iscsi.initiator.provider ~ '.tmpl'],
                               lookup='iscsi-initiator-config-install-file-managed',
@@ -26,6 +29,10 @@ iscsi-initiator-config-install-file-managed:
     - template: jinja
     - require_in:
       - sls: {{ sls_service_install }}
+    - require:
+      - sls: {{ sls_package_install }}
     - context:
       data: {{ iscsi.config.data[iscsi.initiator.provider|string]|json }}
       component: initiator
+
+    {%- endif %}

iscsi/initiator/make/clean.sls

@@ -4,18 +4,23 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.initiator.service.clean' %}
+{%- set sls_config_clean = tplroot ~ '.initiator.config.clean' %}
 {%- from tplroot ~ "/map.jinja" import iscsi with context %}
 
   {%- if iscsi.initiator.make.wanted %}
 include:
   - {{ sls_service_clean }}
+  - {{ sls_config_clean }}
+
       {%- for pkg in iscsi.initiator.make.wanted %}
 
 iscsi-initiator-package-make-clean-{{ pkg }}-removed:
   pkg.removed:
     - name: {{ pkg }}
     - require:
       - sls: {{ sls_service_clean }}
+      - sls: {{ sls_config_clean }}
 
       {%- endfor %}
+
   {%- endif %}

iscsi/initiator/make/install.sls

@@ -4,12 +4,14 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_install = tplroot ~ '.initiator.service.install' %}
+{%- set sls_config_install = tplroot ~ '.initiator.config.install' %}
 {%- from tplroot ~ "/map.jinja" import iscsi with context %}
 
   {%- if iscsi.initiator.make.wanted %}
       {%- if salt['cmd.run']("id iscsi.user", output_loglevel='quiet') %}
 include:
   - {{ sls_service_install }}
+  - {{ sls_config_install }}
 
 iscsi-initiator-make-file-directory:
   file.directory:
@@ -51,6 +53,7 @@ iscsi-initiator-make-{{ pkg }}-cmd-run:
       - git: iscsi-initiator-make-{{ pkg }}-git-latest
     - require_in:
       - sls: {{ sls_service_install }}
+      - sls: {{ sls_config_install }}
 
           {% endfor %}
       {%- endif %}

iscsi/initiator/package/install.sls

@@ -4,10 +4,12 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_install = tplroot ~ '.initiator.config.install' %}
+{%- set sls_service_install = tplroot ~ '.initiator.service.install' %}
 {%- from tplroot ~ "/map.jinja" import iscsi with context %}
 
 include:
   - {{ sls_config_install }}
+  - {{ sls_service_install }}
 
     {%- if iscsi.initiator.pkgs.unwanted %}
         {%- for pkg in iscsi.initiator.pkgs.unwanted %}
@@ -17,6 +19,7 @@ iscsi-initiator-package-install-{{ pkg }}-removed:
     - name: {{ pkg }}
     - require_in:
       - sls: {{ sls_config_install }}
+      - sls: {{ sls_service_install }}
 
         {%- endfor %}
     {%- endif %}
@@ -32,6 +35,7 @@ iscsi-initiator-package-install-{{ pkg }}-installed:
     - reload: True
     - require_in:
       - sls: {{ sls_config_install }}
+      - sls: {{ sls_service_install }}
 
         {%- endfor %}
     {%- endif %}

iscsi/initiator/service/clean.sls

@@ -13,8 +13,10 @@ iscsi-initiator-service-clean-service-dead:
   service.dead:
     - name: {{ iscsi.config.servicename[iscsi.initiator.provider] }}
     - enable: False
-    - require_in:
+        {%- if iscsi.config.data[iscsi.initiator.provider|string] %}
+    - watch_in:
       - sls: {{ sls_config_clean }}
+        {%- endif %}
 
     {%- if grains.os_family == 'FreeBSD' %}
 
@@ -25,5 +27,9 @@ iscsi-initiator-service-clean-file-line-freebsd:
     - mode: delete
     - backup: True
     - quiet: True
+        {%- if iscsi.config.data[iscsi.initiator.provider|string] %}
+    - watch_in:
+      - sls: {{ sls_config_clean }}
+        {%- endif %}
 
     {%- endif %}

iscsi/initiator/service/install.sls

@@ -36,19 +36,21 @@ iscsi-initiator-service-install-service-running:
     - name: {{ servicename }}
     - enable: True
     - onfail_in:
-      - test: iscsi-initiator-service-install-failure-explanation
+      - test: iscsi-initiator-service-install-check-status
+            {%- if iscsi.config.data[iscsi.initiator.provider|string] %}
+    - require:
+      - sls: {{ sls_config_install }}
     - watch:
       - file: iscsi-initiator-config-install-file-managed
+            {%- endif %}
         {%- endif %}
         {%- if servicename is iterable and servicename is not string %}
     - names: {{ servicename|json }}
           {%- else %}
     - name: {{ servicename }}
         {%- endif %}
-    - require:
-      - sls: {{ sls_config_install }}
 
-iscsi-initiator-service-install-failure-explanation:
+iscsi-initiator-service-install-check-status:
   test.show_notification:
     - text: |
         In certain circumstances the iscsi initiator service will not start.