Refactor check condition syntax (#4)

.github/workflows/molecule.yml

@@ -23,8 +23,8 @@ jobs:
     strategy:
       matrix:
         scenario:
-          - name: default
-          - name: elastic
+          - name: 7x
+          - name: 8x
         image:
           - name: ubuntu2204
             command: /lib/systemd/systemd

Makefile

@@ -1,6 +1,6 @@
 .PHONY: all ${MAKECMDGOALS}
 
-MOLECULE_SCENARIO ?= default
+MOLECULE_SCENARIO ?= 7x
 MOLECULE_DOCKER_IMAGE ?= ubuntu2004
 GALAXY_API_KEY ?=
 GITHUB_REPOSITORY ?= $$(git config --get remote.origin.url | cut -d: -f 2 | cut -d. -f 1)

README.md

@@ -21,7 +21,7 @@ Please review the [dependency configuration](/meta/main.yml) for more details
 - hosts: servers
   vars:
     heartbeat_package_state: latest
-    heartbeat_conf_manage: yes
+    heartbeat_conf_manage: true
     heartbeat_conf:
       heartbeat:
         monitors:

defaults/main.yml

@@ -1,10 +1,10 @@
 ---
 heartbeat_package_names: heartbeat-elastic
 heartbeat_package_state: present
-heartbeat_package_hold: no
-heartbeat_conf_manage: yes
+heartbeat_package_hold: false
+heartbeat_conf_manage: true
 heartbeat_conf_path: /etc/heartbeat/heartbeat.yml
 heartbeat_service_name: heartbeat-elastic
 heartbeat_service_status: started
-heartbeat_service_enabled: yes
-heartbeat_repo_manage: yes
+heartbeat_service_enabled: true
+heartbeat_repo_manage: true

molecule/default/molecule.yml → molecule/7x/molecule.yml

@@ -25,20 +25,20 @@ provisioner:
     defaults:
       callbacks_enabled: ansible.posix.profile_tasks
   inventory:
-    hosts:
+    group_vars:
       all:
-        vars:
-          heartbeat_package_hold: yes
-          heartbeat_conf:
-            heartbeat:
-              monitors:
-                - type: http
-                  schedule: '*/1 * * * * * *'
-                  urls:
-                    - https://www.google.com
-            output:
-              file:
-                path: /tmp
-                filename: heartbeat
+        elasticsearch_repo_major_version: 7
+        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

molecule/elastic/molecule.yml → molecule/8x/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: yes
-          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

molecule/common/prepare.yml

@@ -4,5 +4,5 @@
   tasks:
     - name: Update apt package cache
       ansible.builtin.apt:
-        update_cache: yes
+        update_cache: true
       when: ansible_os_family == 'Debian'

molecule/common/verify.yml

@@ -13,6 +13,13 @@
         msg: "Package {{ _package }} was not deployed"
       when: _package not in packages
 
+    - name: Check package version
+      ansible.builtin.fail:
+        msg: "Found unexpected major version '{{ _version[0] }}' expected '{{ elasticsearch_repo_major_version }}'"
+      vars:
+        _version: "{{ packages[_package][0].version }}"
+      when: (_version[0] | string) != (elasticsearch_repo_major_version | string)
+
     - name: Collect service facts
       ansible.builtin.service_facts:
 
@@ -39,4 +46,3 @@
       retries: 2
       delay: 60
       until: _output_file.stat.exists
-      when:

tasks/main.yml

@@ -52,7 +52,7 @@
             selection: hold
           loop: "{{ [heartbeat_package_names] | flatten }}"
           changed_when: false
-          when: (ansible_os_family | lower) == 'debian'
+          when: ansible_os_family == 'Debian'
 
         - name: Enable yum package lock
           community.general.yum_versionlock: