Refactor molecule inventory vardefs

nephelaiio · Nov 4, 2023 · 257735a · 257735a
1 parent 15b27ca
commit 257735a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 31 deletions.
diff --git a/molecule/common/verify.yml b/molecule/common/verify.yml
@@ -39,4 +39,3 @@
       retries: 2
       delay: 60
       until: _output_file.stat.exists
-      when:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -25,20 +25,19 @@ provisioner:
     defaults:
       callbacks_enabled: ansible.posix.profile_tasks
   inventory:
-    hosts:
+    group_vars:
       all:
-        vars:
-          heartbeat_package_hold: true
-          heartbeat_conf:
-            heartbeat:
-              monitors:
-                - type: http
-                  schedule: '*/1 * * * * * *'
-                  urls:
-                    - https://www.google.com
-            output:
-              file:
-                path: /tmp
-                filename: heartbeat
+        heartbeat_package_hold: true
+        heartbeat_conf:
+          heartbeat:
+            monitors:
+              - type: http
+                schedule: '*/1 * * * * * *'
+                urls:
+                  - https://www.google.com
+          output:
+            file:
+              path: /tmp
+              filename: heartbeat
 verifier:
   name: ansible
diff --git a/molecule/elastic/molecule.yml b/molecule/elastic/molecule.yml
@@ -25,22 +25,21 @@ provisioner:
     defaults:
       callbacks_enabled: ansible.posix.profile_tasks
   inventory:
-    hosts:
+    group_vars:
       all:
-        vars:
-          elasticsearch_repo_major_version: 8
-          elastic_repo_oss: false
-          heartbeat_package_hold: true
-          heartbeat_conf:
-            heartbeat:
-              monitors:
-                - type: http
-                  schedule: '*/1 * * * * * *'
-                  urls:
-                    - https://www.google.com
-            output:
-              file:
-                path: /tmp
-                filename: heartbeat
+        elasticsearch_repo_major_version: 8
+        elastic_repo_oss: false
+        heartbeat_package_hold: true
+        heartbeat_conf:
+          heartbeat:
+            monitors:
+              - type: http
+                schedule: '*/1 * * * * * *'
+                urls:
+                  - https://www.google.com
+          output:
+            file:
+              path: /tmp
+              filename: heartbeat
 verifier:
   name: ansible