fix(os): fix open-iscsi on archlinux

saltstack-formulas · Sep 11, 2019 · 43b2ad4 · 43b2ad4
1 parent 499e356
commit 43b2ad4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/iscsi/initiator/install.sls b/iscsi/initiator/install.sls
@@ -76,7 +76,7 @@ iscsi_initiator_service_config:
         data: {{ data|json }}
         component: 'initiator'
         provider: {{ provider }}
-        json: {{ data['man5']['format']['json'] }}
+        json: {{ data['man5']['format']['json']|json }}
 
   {%- if iscsi.kernel.mess_with_kernel and data.man5.kmodule and data.man5.kloadtext %}
 iscsi_initiator_kernel_module:
@@ -122,7 +122,11 @@ iscsi_initiator_service:
     - watch:
       - file: iscsi_initiator_service_config
         {%- endif %}
+        {%- if data.man5.svcname is iterable and data.man5.svcname is not string %}
+    - names: {{ data.man5.svcname|json }}
+        {%- else %}
     - name: {{ data.man5.svcname }}
+        {%- endif %}
         {%- if data.man5.kmodule %}
     - unless: {{ iscsi.kernel.modquery }} {{ data.man5.kmodule }}
         {%- endif %}

diff --git a/iscsi/osfamilymap.yaml b/iscsi/osfamilymap.yaml
@@ -58,6 +58,12 @@ Gentoo:
         kmodule: iscsi_tcp
 
 Arch:
+  initiator:
+    open-iscsi:
+      man5:
+        svcname:   ##open-iscsi on archlinux uses non-standard service names
+         - iscsi
+         - iscsid
   user: iscsimake
   client:
     make:

diff --git a/iscsi/target/install.sls b/iscsi/target/install.sls
@@ -76,7 +76,7 @@ iscsi_target_service_config:
         data: {{ data|json }}
         component: 'target'
         provider: {{ provider }}
-        json: {{ data['man5']['format']['json'] }}
+        json: {{ data['man5']['format']['json']|json }}
 
   {%- if iscsi.kernel.mess_with_kernel and data.man5.kmodule and data.man5.kloadtext %}
 iscsi_target_kernel_module:

diff --git a/pillar.example b/pillar.example
@@ -1,5 +1,22 @@
 #Sample pillars for iSNS/iSCSI on FreeBSD and GNU/Linux
 
+  {% if grains.os == 'Arch' %}
+     ### this user is needed for archlinux
+users:
+  iscsimake:
+    sudouser: True
+    shell: /bin/bash
+    empty_password: True
+    home: /home/iscsimake
+    createhome: True
+    optional_groups:
+      - wheel
+      - root
+    sudo_rules:
+     - 'ALL=(ALL) ALL'
+  {% endif %}
+
+
 iscsi:
   isns:
     enabled: True