Merge pull request #36 from myii/ci/replace-eol-pre-salted-images

refactor(kitchen+inspec): move inline pillars to files
saltstack-formulas · Jul 13, 2019 · f3a168b · f3a168b
2 parents ca43822 + 4dc3025
commit f3a168b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 25 deletions.
diff --git a/kitchen.yml b/kitchen.yml
@@ -144,12 +144,8 @@ suites:
           base:
             '*':
               - vault
-        vault.sls:
-          vault:
-#            version: 1.0.3    # test upgrades by doing a double-converge, changing the version pillar between each one
-            version: 1.1.0
-            verify_download: False
-
+      pillars_from_files:
+        vault.sls: test/salt/pillar/install_binary.sls
   - name: dev_server
     provisioner:
       state_top:
@@ -161,9 +157,8 @@ suites:
           base:
             '*':
               - vault
-        vault.sls:
-          vault:
-            dev_mode: True
+      pillars_from_files:
+        vault.sls: test/salt/pillar/dev_server.sls
   - name: prod_server
     provisioner:
       state_top:
@@ -175,19 +170,5 @@ suites:
           base:
             '*':
               - vault
-        vault.sls:
-          vault:
-            config:
-              storage:
-                file:
-                  path: /var/lib/vault/data
-            tls_disable: 1
-            self_signed_cert:
-              enabled: True
-              hostname: localhost
-              password: localhost
-              country: GB
-              state: England
-              city: London
-              org: example.com
-              org_unit: testing
+      pillars_from_files:
+        vault.sls: test/salt/pillar/prod_server.sls
diff --git a/test/salt/pillar/dev_server.sls b/test/salt/pillar/dev_server.sls
@@ -0,0 +1,2 @@
+vault:
+  dev_mode: True
diff --git a/test/salt/pillar/install_binary.sls b/test/salt/pillar/install_binary.sls
@@ -0,0 +1,4 @@
+vault:
+  # version: 1.0.3    # test upgrades by doing a double-converge, changing the version pillar between each one
+  version: 1.1.0
+  verify_download: False
diff --git a/test/salt/pillar/prod_server.sls b/test/salt/pillar/prod_server.sls
@@ -0,0 +1,15 @@
+vault:
+  config:
+    storage:
+      file:
+        path: /var/lib/vault/data
+  tls_disable: 1
+  self_signed_cert:
+    enabled: True
+    hostname: localhost
+    password: localhost
+    country: GB
+    state: England
+    city: London
+    org: example.com
+    org_unit: testing