Added second package check

Centos8-Dockerfile

@@ -1,6 +1,7 @@
 # Centos8-Dockerfile
 FROM docker.io/pycontribs/centos:8
 RUN yum install -y iproute firewalld net-tools && \
-    systemctl disable nftables && \
-    systemctl enable firewalld && \
-    
+    sed -i 's/FirewallBackend=nftables/FirewallBackend=iptables/' /etc/firewalld/firewalld.conf && \
+    sed -i 's/IPv6_rpfilter=yes/IPv6_rpfilter=no/' /etc/firewalld/firewalld.conf && \
+    systemctl enable firewalld
+

defaults/main.yml

@@ -14,6 +14,11 @@ cmk_rpm_agent: http://url-from-your-agent-bakery-in-checkmk.rpm
 # Copy paste the link address for MSI (Windows) agent from CheckMK
 cmk_msi_agent: http://url-from-your-agent-bakery-in-checkmk.msi
 
+# Check_MK GPG Key
+# Copy paste the link address from Signature Keys for Signing Agents page
+cmk_gpg_key_id: 1
+cmk_gpg_key_url: "{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/wato.py?key={{ cmk_gpg_key_id }}&mode=download_signature_key"
+
 
 # Should be username of an automation user in checkmk
 cmk_username: some-username

handlers/main.yml

@@ -15,8 +15,4 @@
     port: 6556/tcp
     state: enabled
     permanent: yes
-    immediate: yes
-
-- name: ensure firewall reloaded
-  command: firewall-cmd --reload
-  changed_when: false
+    immediate: yes

molecule/default/molecule.yml

@@ -5,20 +5,21 @@ driver:
   name: docker
 platforms:
   - name: rhel8
-    image: docker.io/pycontribs/centos:8
+    image: guisea/centos8-ansible:latest
+    #dockerfile: Centos8-Dockerfile
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/usr/sbin/init"
     pre_build_image: true
   - name: rhel7
-    image: docker.io/pycontribs/centos:7
-    dockerfile: Centos7-Dockerfile
+    image: guisea/centos7-ansible:latest
+    # dockerfile: Centos7-Dockerfile
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/usr/sbin/init"
-    pre_build_image: false
+    pre_build_image: true
 provisioner:
   name: ansible
 verifier:

tasks/RedHat-register.yml

@@ -1,5 +1,31 @@
-- name: Register with CheckMK Update Server
-  shell: |
-    cmk-update-agent register -H $(hostname -s) --user {{ cmk_username }} \
-    --secret {{ cmk_secret }}
-  changed_when: false
+- block:
+    - name: Register with CheckMK Update Server
+      shell: |
+        cmk-update-agent register -H $(hostname -s) --user {{ cmk_username }} \
+        --secret {{ cmk_secret }}
+      changed_when: false
+  rescue:
+    - name: Gather facts of packages
+      package_facts:
+        manager: "auto"
+
+    - name: Ensure check_mk_agent installed (again)
+      package:
+        name: "{{ cmk_rpm_agent }}{{ cmk_auth }}"
+        state: latest
+        disable_gpg_check: true
+      notify:
+        - restart xinetd
+        - ensure firewall open
+      when: "'check-mk-agent' not in ansible_facts.packages"
+
+    - name: Gather facts of packages (again)
+      package_facts:
+        manager: "auto"
+    
+    - name: Register with CheckMK Update Server (retry)
+      shell: |
+        cmk-update-agent register -H $(hostname -s) --user {{ cmk_username }} \
+        --secret {{ cmk_secret }}
+      changed_when: false
+      when: "'check-mk-agent' in ansible_facts.packages"

tasks/RedHat.yml

@@ -1,9 +1,9 @@
 ---
 # Tasks for installation on RedHat Family
 - name: Ensure xinetd installed
-  yum:
+  package:
     name: xinetd
-    state: installed
+    state: present
   notify: restart xinetd
 
 - name: Gather facts of packages
@@ -11,26 +11,16 @@
     manager: "auto"
 
 - name: Install check-mk-agent
-  block:
-    - name: Download the agent from Server
-      get_url:
-        url: "{{ cmk_rpm_agent }}{{ cmk_auth }}"
-        dest: /tmp/check-mk-agent.rpm
-
+  block:    
     - name: Ensure check_mk_agent installed
-      yum:
-        name: /tmp/check-mk-agent.rpm
-        state: installed
+      package:
+        name: "{{ cmk_rpm_agent }}{{ cmk_auth }}"
+        state: latest
+        disable_gpg_check: true
       notify:
         - restart xinetd
         - cmk fresh install
         - ensure firewall open
-        - ensure firewall reloaded
-
-    - name: Remove agent Download
-      file:
-        path: /tmp/check-mk-agent.rpm
-        state: absent
   when: "'check-mk-agent' not in ansible_facts.packages or cmk_force_install"
   tags:
     - check_mk_agent