docs(lint): fix lint errors & skip service on centos/travis

saltstack-formulas · Oct 4, 2019 · 1a6161f · 1a6161f
1 parent f72fe9e
commit 1a6161f
Show file tree

Hide file tree

Showing 9 changed files with 696 additions and 106 deletions.
diff --git a/iscsi/defaults.yaml b/iscsi/defaults.yaml
@@ -3,20 +3,20 @@
 ---
 iscsi:
   filemode: '0640'
-  user: iscsimake  #archlinux only
+  user: iscsimake  # archlinux only
   rootgroup: root
   subcomponent:
     config: '/etc/iscsi-subcomponent-formula.conf'
   # Just here for testing
   added_in_defaults: defaults_value
   winner: defaults
-  loadkernelmodule: False
+  loadkernelmodule: false
 
   config:
     acl:
       allow:
         ietd: /etc/ietd/initiators.allow
-      deny: 
+      deny:
         ietd: /etc/ietd/initiators.deny
     name:
       modprobe: /etc/modprobe.d/iscsi-modules.conf
@@ -27,21 +27,21 @@ iscsi:
       ietd: /etc/ietd.conf
       lio: /etc/target/saveconfig.json
       isns: /etc/isns/isnsd.conf
-      isnsadm: False
-      isnsdd: False
+      isnsadm: false
+      isnsdd: false
       open-iscsi: /etc/iscsi/iscsid.conf
     servicename:
       iscsi: iscsid
-      fcoe:                   #Fibre-Channel over Ethernet (FCoE) Target
+      fcoe:                   # Fibre-Channel over Ethernet (FCoE) Target
         - fcoe
         - lldpad
         - fcoe-target
-      tgtd: tgt               #TGT Project (userspace) RedHat/Debian/Arch/Gentoo
-      ctld: ctld              #CAM Target Layer/iSCSI target daemon, FreeBSD.
-      ietd: iscsitarget       #iSCSI Enterprise Target (IET) project
-      isns: isnsd             #Open-iSNS implements iSNS protocol (RFC4171)
-      lio: target             #LIO is defacto standard on enterprise linux
-      open-iscsi: open-iscsi  #Open-iSCSI
+      tgtd: tgt               # TGT Project (userspace) RedHat/Debian/Arch/Gentoo
+      ctld: ctld              # CAM Target Layer/iSCSI target daemon, FreeBSD.
+      ietd: iscsitarget       # iSCSI Enterprise Target (IET) project
+      isns: isnsd             # Open-iSNS implements iSNS protocol (RFC4171)
+      lio: target             # LIO is defacto standard on enterprise linux
+      open-iscsi: open-iscsi  # Open-iSCSI
     servicetext:
       iscsi: 'iscsictl_enable="YES"'
       ctld: 'iscsid_enable="YES"'
@@ -91,9 +91,9 @@ iscsi:
     modquery: modinfo
 
   isns:
-    enabled: True
+    enabled: true
     provider: isns
-    pkghold: False
+    pkghold: false
     pkgs:
       wanted:
         - open-isns
@@ -102,10 +102,10 @@ iscsi:
       wanted: []
 
   initiator:
-    enabled: True
-    loadmodule: False
+    enabled: true
+    loadmodule: false
     provider: open-iscsi
-    pkghold: False
+    pkghold: false
     pkgs:
       wanted:
         - open-iscsi
@@ -115,10 +115,10 @@ iscsi:
 
   target:
     port: 3260
-    loadmodule: False
-    enabled: True
+    enabled: true
+    loadmodule: false
     provider: lio
-    pkghold: False
+    pkghold: false
     pkgs:
       wanted: []
       unwanted: []

diff --git a/iscsi/osfamilymap.yaml b/iscsi/osfamilymap.yaml
@@ -15,7 +15,7 @@ Debian:
     servicename:
       isns: isnsd
   initiator:
-    enabled: False  #see https://github.com/saltstack-formulas/iscsi-formula/issues/10
+    enabled: false  # see https://github.com/saltstack-formulas/iscsi-formula/issues/10
     pkgs:
       wanted:
         - open-iscsi
@@ -56,7 +56,7 @@ RedHat:
 
 Suse:
   config:
-    servicename: 
+    servicename:
       open-iscsi: iscsid
       lio: targetcli
   isns:
@@ -107,15 +107,15 @@ Arch:
        - iscsid
     kmodule:
       lio:
-        name: 
+        name:
         text:
   initiator:
     make:
       gitrepo: https://aur.archlinux.org
       cmd: makepkg -si --noconfirm -f
       wanted: []
   target:
-    loadmodule: True
+    loadmodule: true
     pkgs:
       wanted:
         - linux-lts                # For kernel scsi modules
@@ -138,7 +138,7 @@ FreeBSD:
       wanted:
         - net/open-isns
   target:
-    loadmodule: True
+    loadmodule: true
     provider: ctld
     pkgs:
       wanted:

diff --git a/iscsi/osfingermap.yaml b/iscsi/osfingermap.yaml
@@ -33,7 +33,7 @@ CentOS-7:
         - libiscsi
         - libiscsi-utils
   target:
-    loadmodule: True
+    loadmodule: true
     pkgs:
       wanted:
         - yum-plugin-versionlock
@@ -53,12 +53,12 @@ CentOS-8:
         - libiscsi
         - libiscsi-utils
   target:
-    loadmodule: True
+    loadmodule: true
     pkgs:
       wanted:
         - yum-plugin-versionlock
         - targetcli
         - libvirt-daemon-driver-storage-iscsi
         - libvirt-daemon-driver-storage-iscsi-direct
-        - thin-provisioning-tools
+        # thin-provisioning-tools
         - udisks2-iscsi
diff --git a/iscsi/osmap.yaml b/iscsi/osmap.yaml
@@ -53,7 +53,7 @@ Fedora:
     provider: tgtd
     pkgs:
       wanted:
-        - device-mapper-persistent-data
+        - device-mapper-persistent-data   #aka thin-provisioning-tools
         - netbsd-iscsi
         - yum-plugin-versionlock
         - targetcli

diff --git a/kitchen.yml b/kitchen.yml
@@ -151,8 +151,7 @@ verifier:
 suites:
   - name: default
     excludes:
-    - default-centos-6-2017-7-py2
-    - default-centos-7-2019-2-py3
+      - default-centos-7-2019-2-py3
     provisioner:
       dependencies:
         - name: lvm
@@ -172,19 +171,18 @@ suites:
             '*':
               - iscsi
       pillars_from_files:
-        iscsi.sls: test/integration/default/pillar.example.loopdevs-4-7
+        iscsi.sls: test/salt/pillar/pillar.example
     verifier:
       inspec_tests:
         - path: test/integration/default
 
   - name: centos7
     excludes:
-    - default-debian-10-develop-py3
-    - default-ubuntu-1804-2019-2-py3
-    - default-opensuse-leap-15-2018-3-py2
-    - default-amazonlinux-2-2018-3-py2
-    - default-centos-6-2017-7-py2
-    - default-fedora-30-develop-py3
+      - default-debian-10-develop-py3
+      - default-ubuntu-1804-2019-2-py3
+      - default-opensuse-leap-15-2018-3-py2
+      - default-amazonlinux-2-2018-3-py2
+      - default-fedora-30-develop-py3
     provisioner:
       dependencies:
         - name: lvm
@@ -194,6 +192,8 @@ suites:
         base:
           '*':
             - lvm.install
+            - lvm.pv.remove
+            - lvm.files.remove
             - lvm.files.create
             - lvm.pv.create
             - iscsi.initiator.clean
@@ -207,19 +207,18 @@ suites:
             '*':
               - iscsi
       pillars_from_files:
-        iscsi.sls: test/integration/default/pillar.example.loopdevs-4-7
+        iscsi.sls: test/salt/pillar/pillar.example
     verifier:
       inspec_tests:
         - path: test/integration/default
 
-  - name: centos6
+  - name: centos     # skip service start state on travis
     excludes:
-    - default-debian-10-develop-py3
-    - default-ubuntu-1804-2019-2-py3
-    - default-opensuse-leap-15-2018-3-py2
-    - default-amazonlinux-2-2018-3-py2
-    - default-centos-7-2019-2-py3
-    - default-fedora-30-develop-py3
+      - default-debian-10-develop-py3
+      - default-ubuntu-1804-2019-2-py3
+      - default-opensuse-leap-15-2018-3-py2
+      - default-amazonlinux-2-2018-3-py2
+      - default-fedora-30-develop-py3
     provisioner:
       dependencies:
         - name: lvm
@@ -229,10 +228,13 @@ suites:
         base:
           '*':
             - lvm.install
+            - lvm.pv.remove
+            - lvm.files.remove
             - lvm.files.create
             - lvm.pv.create
             - iscsi.initiator.clean
             - iscsi.target.clean
+            - iscsi.isns
             - iscsi.target
             - iscsi.initiator
       pillars:
@@ -241,7 +243,7 @@ suites:
             '*':
               - iscsi
       pillars_from_files:
-        iscsi.sls: test/integration/default/pillar.example.loopdevs-4-7
+        iscsi.sls: test/salt/pillar/pillar.travis
     verifier:
       inspec_tests:
         - path: test/integration/default
diff --git a/pillar.example b/pillar.example
@@ -4,18 +4,17 @@
     {% if grains.os_family in ('Arch',) %}
 users:
   iscsimake:
-    sudouser: True
+    sudouser: true
     shell: /bin/bash
-    empty_password: True
+    empty_password: true
     home: /home/iscsimake
-    createhome: True
+    createhome: true
     optional_groups:
       - wheel
       - root
     sudo_rules:
      - 'ALL=(ALL) ALL'
     {% endif %}
-
 lvm:
   files:
     remove:
@@ -58,6 +57,8 @@ lvm:
       /dev/loop3: {}
 
 iscsi:
+  #target:
+  #  enabled: true
   config:
     data:
       open-iscsi:
@@ -636,4 +637,3 @@ iscsi:
                   iser: 0
               tag: 2
             wwn: iqn.1996-04.lx.suse:01:a66aed20e2f3
-
diff --git a/test/salt/pillar/centos6.sls b/test/salt/pillar/centos6.sls
diff --git a/...ation/default/pillar.example.loopdevs-4-7 → test/salt/pillar/pillar.example b/...ation/default/pillar.example.loopdevs-4-7 → test/salt/pillar/pillar.example
@@ -4,22 +4,18 @@
     {% if grains.os_family in ('Arch',) %}
 users:
   iscsimake:
-    sudouser: True
+    sudouser: true
     shell: /bin/bash
-    empty_password: True
+    empty_password: true
     home: /home/iscsimake
-    createhome: True
+    createhome: true
     optional_groups:
       - wheel
       - root
     sudo_rules:
      - 'ALL=(ALL) ALL'
     {% endif %}
-
 lvm:
-  pkgs:
-    - lvm2
-    # cryptsetup
   files:
     remove:
       - /tmp/loopdevs/testfile0.img
@@ -639,4 +635,3 @@ iscsi:
                   iser: 0
               tag: 2
             wwn: iqn.1996-04.lx.suse:01:a66aed20e2f3
-