fix(freebsd): required changes for freebsd 11.2

saltstack-formulas · Oct 4, 2019 · 1ef79ec · 1ef79ec
1 parent 5de113d
commit 1ef79ec
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 deletions.
diff --git a/docs/README.rst b/docs/README.rst
@@ -16,13 +16,6 @@ iscsi-formula
 
 Configure iSCSI targets and initiator on GNU/Linux and FreeBSD.
 
-Technology
-----------
-.. image:: docs/link-transport-storage-protocols.png
-   :target: https://github.com/saltstack-formulas/iscsi-formula
-   :scale: 25 %
-   :alt: Link/Transport and Storage protocol infographic
-
 .. contents:: **Table of Contents**
 
 General notes
@@ -46,6 +39,13 @@ Contributing to this repo
 
 Please see :ref:`How to contribute <CONTRIBUTING>` for more details.
 
+Scope
+-----
+.. image:: docs/link-transport-storage-protocols.png
+   :target: https://github.com/saltstack-formulas/iscsi-formula
+   :scale: 25 %
+   :alt: Link/Transport and Storage protocol infographic
+
 Available states
 ----------------
 

diff --git a/iscsi/initiator/service/clean.sls b/iscsi/initiator/service/clean.sls
@@ -18,7 +18,7 @@ iscsi-initiator-service-clean-service-dead
 
 iscsi-initiator-service-install-file-line-freebsd:
   file.line:
-    - onlyif: {{ grains.os == 'FreeBSD' }}
+    - onlyif: {{ grains.os_family == 'FreeBSD' }}
     - name: {{ iscsi.config.name.modprobe }}
     - content: 'ctld_env="-u"'
     - mode: delete

diff --git a/iscsi/initiator/service/install.sls b/iscsi/initiator/service/install.sls
@@ -9,19 +9,18 @@
 include:
   - {{ sls_config_install }}
 
-    {%- if grains.os == 'FreeBSD' %}
+    {%- if grains.os_family == 'FreeBSD' %}
 
 iscsi-initiator-service-install-file-line-freebsd:
   file.line:
     - name: {{ iscsi.config.name.modprobe }}
     - content: 'ctld_env="-u"'
     - backup: True
-        {%- if not iscsi.initiator.enabled %}
-    - mode: delete
-        {%- else %}
+        {%- if iscsi.initiator.enabled %}
     - mode: ensure
-    - after: 'sshd_enable.*'
-    - create: True
+    - after: 'autoboot_delay.*'
+        {%- else %}
+    - mode: delete
         {%- endif %}
     {%- endif %}
 

diff --git a/iscsi/target/service/clean.sls b/iscsi/target/service/clean.sls
@@ -18,7 +18,7 @@ iscsi-target-service-clean-service-dead
 
 iscsi-target-service-install-file-line-freebsd:
   file.line:
-    - onlyif: {{ grains.os == 'FreeBSD' }}
+    - onlyif: {{ grains.os_family == 'FreeBSD' }}
     - name: {{ iscsi.config.name.modprobe }}
     - content: 'ctld_env="-u"'
     - mode: delete

diff --git a/iscsi/target/service/install.sls b/iscsi/target/service/install.sls
@@ -9,18 +9,17 @@
 include:
   - {{ sls_config_install }}
 
-    {%- if grains.os == 'FreeBSD' %}
+    {%- if grains.os_family == 'FreeBSD' %}
 iscsi-target-service-install-file-line-freebsd:
   file.line:
     - name: {{ iscsi.config.name.modprobe }}
     - content: 'ctld_env="-u"'
     - backup: True
-        {%- if not iscsi.target.enabled %}
-    - mode: delete
-        {%- else %}
+        {%- if iscsi.target.enabled %}
     - mode: ensure
-    - after: 'sshd_enable.*'
-    - create: True
+    - after: 'autoboot_delay.*'
+        {%- else %}
+    - mode: delete
         {%- endif %}
     {%- endif %}