Merge pull request #18 from noelmcloughlin/fixes

Updated for OpenSUSE 15.0
saltstack-formulas · Feb 22, 2019 · 499e356 · 499e356
2 parents 4f8e014 + 5d0e199
commit 499e356
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/iscsi/initiator/install.sls b/iscsi/initiator/install.sls
@@ -20,7 +20,9 @@ iscsi_initiator_unwanted_pkgs_{{ pkg }}:
 iscsi_initiator_wanted_pkgs_{{ pkg }}:
   pkg.installed:
     - name: {{ pkg }}
+        {%- if iscsi.client.pkghold %}
     - hold: {{ iscsi.client.pkghold }}
+        {%- endif %}
     - reload: True
     - require_in:
       - file: iscsi_initiator_service_config

diff --git a/iscsi/isns/install.sls b/iscsi/isns/install.sls
@@ -20,7 +20,9 @@ iscsi_isnsd_remove_{{ pkg }}_pkg:
 iscsi_isnsd_install_{{ pkg }}_pkg:
   pkg.installed:
     - name: {{ pkg }}
+        {%- if iscsi.isns.pkghold %}
     - hold: {{ iscsi.isns.pkghold }}
+        {%- endif %}
     - reload: True
     - require_in:
       - file: iscsi_isnsd_service_config

diff --git a/iscsi/osfamilymap.yaml b/iscsi/osfamilymap.yaml
@@ -125,14 +125,24 @@ Suse:
   client:
     pkgs:
       wanted:
+        - libopeniscsiusr0_2_0
         - open-iscsi
+        - libiscsi8
+        - librdmacm1
         - qemu-block-iscsi
+        - iscsiuio
         - yast2-iscsi-client
   server:
     pkgs:
       wanted:
-        - yast2-iscsi-lio-server
-        - iscsiuio
+        - python3-configshell-fb
+        - python3-pyudev
+        - python3-rtslib-fb
+        - python3-targetcli-fb
+        - python3-urwid
+        - targetcli-fb-common
         - libiscsi-utils
+        - iscsiuio
+        - yast2-iscsi-lio-server
         - qemu-block-iscsi
 
diff --git a/iscsi/target/install.sls b/iscsi/target/install.sls
@@ -20,7 +20,9 @@ iscsi_target_unwanted_pkgs_{{ pkg }}:
 iscsi_target_wanted_pkgs_{{ pkg }}:
   pkg.installed:
     - name: {{ pkg }}
+        {%- if iscsi.server.pkghold %}
     - hold: {{ iscsi.server.pkghold }}
+        {%- endif %}
     - reload: True
     - require_in:
       - file: iscsi_target_service_config