fix(pillardata): clustered=>shared; fix yamllint issues

saltstack-formulas · Sep 22, 2019 · 137070c · 137070c
1 parent efff68c
commit 137070c
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 151 deletions.
diff --git a/lvm/.yamllint → .yamllint b/lvm/.yamllint → .yamllint
diff --git a/README.rst b/README.rst
@@ -280,7 +280,7 @@ Split volume group(s) into two::
         devices:
           - /dev/sdf
         options:
-          clustered: n
+          shared: n
           maxphysicalvolumes: 0
           maxlogicalvolumes: 0
 
@@ -313,7 +313,7 @@ Create volume group(s)::
           - /dev/sdb
           - /dev/sdc
         options:
-          clustered: n
+          shared: n
           maxlogicalvolumes: 0
           maxphysicalvolumes: 0
           physicalextentsize: 1024

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+    extends: ['@commitlint/config-conventional'],
+};
diff --git a/lvm/defaults.yaml b/lvm/defaults.yaml
@@ -1,5 +1,6 @@
 # vim: sts=2 ts=2 sw= et ai
 #
+---
 lvm:
   pkgs:
     - lvm2
@@ -26,11 +27,10 @@ lvm:
       vendor: kernel
       format:
         div: "="
-        ucl:  False
-        json: False
+        ucl: false
+        json: false
   vg:
-    enable_export: False
-    enable_cfgrestore: False
+    enable_export: false
+    enable_cfgrestore: false
   pv: {}
   lv: {}
-
diff --git a/lvm/map.jinja b/lvm/map.jinja
@@ -7,10 +7,8 @@
 {%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
 {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
 {%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
-{%- import_yaml tplroot ~ "/oscodename.yaml" as oscodename %}
 {%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}
 
-
 {#- Retrieve the config dict only once #}
 {%- set _config = salt['config.get'](tplroot, default={}) %}
 
@@ -24,15 +22,11 @@
           osmap,
           grain='os',
           merge=salt['grains.filter_by'](
-            oscodename,
-            grain='oscodename',
+            osfingermap,
+            grain='osfinger',
             merge=salt['grains.filter_by'](
-              osfingermap,
-              grain='osfinger',
-              merge=salt['grains.filter_by'](
-                _config,
-                default='lookup'
-              )
+              _config,
+              default='lookup'
             )
           )
         )

diff --git a/lvm/oscodename.yaml b/lvm/oscodename.yaml
diff --git a/lvm/osfamilymap.yaml b/lvm/osfamilymap.yaml
@@ -11,8 +11,8 @@
 # osfamilymap: {}
 ---
 Debian:
-  #modules:
-    # dm_thin_pool
+  # modules:
+  #   dm_thin_pool
   pkgs:
     - lvm2
     - thin-provisioning-tools
@@ -22,7 +22,6 @@ RedHat:
     - lvm2
     - cryptsetup
     - device-mapper-persistent-data
-    - thin-provisioning-tools
   profiles:
     default:
       thin-generic: {}
@@ -33,13 +32,15 @@ RedHat:
 
 Arch:
   pkgs:
+    - lvm2
     - thin-provisioning-tools
 
 OpenBSD:
   rootgroup: wheel
 
 Suse:
   pkgs:
+    - lvm2
     - thin-provisioning-tools
 
 Gentoo: {}

diff --git a/lvm/osfingermap.yaml b/lvm/osfingermap.yaml
@@ -17,8 +17,8 @@ CentOS-6:
 
 CentOS-7:
   pkgs:
-    - device-mapper-persistent-data   #aka thin-provisioning-tools
+    - device-mapper-persistent-data   # was thin-provisioning-tools
 
 CentOS-8:
   pkgs:
-    - device-mapper-persistent-data   #aka thin-provisioning-tools
+    - device-mapper-persistent-data   # was thin-provisioning-tools
diff --git a/lvm/osmap.yaml b/lvm/osmap.yaml
@@ -13,9 +13,11 @@
 # os_family: RedHat
 Fedora:
   pkgs:
-    - device-mapper-persistent-data   #aka thin-provisioning-tools
+    - lvm2
+    - device-mapper-persistent-data   # was thin-provisioning-tools
 
 # os_family: RedHat
 Amazon:
   pkgs:
-    - device-mapper-persistent-data   #aka thin-provisioning-tools
+    - lvm2
+    - device-mapper-persistent-data   # was thin-provisioning-tools