Merge pull request #53 from sleighzy/fix-ansible-tests

Fix Ansible Molecule unit tests

molecule/default/molecule.yml

@@ -32,49 +32,40 @@ platforms:
     groups:
       - zookeeper-nodes
   - name: zookeeper-2
-    image: geerlingguy/docker-debian10-ansible:latest
-    docker_networks:
-      - name: zookeeper
-        ipam_config:
-          - subnet: '172.26.0.0/16'
+    image: redhat/ubi9:latest
     networks:
       - name: zookeeper
         ipv4_address: '172.26.10.2'
     etc_hosts: "{'zookeeper-1': '172.26.10.1', 'zookeeper-3': '172.26.10.3'}"
-    pre_build_image: true
-    privileged: true
     tmpfs:
       - /run
       - /tmp
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     cgroupns_mode: host
+    command: '/usr/lib/systemd/systemd'
+    pre_build_image: true
     capabilities:
       - SYS_ADMIN
-    command: /lib/systemd/systemd
     groups:
       - zookeeper-nodes
   - name: zookeeper-3
-    image: geerlingguy/docker-debian10-ansible:latest
-    docker_networks:
-      - name: zookeeper
-        ipam_config:
-          - subnet: '172.26.0.0/16'
+    image: redhat/ubi9:latest
     networks:
       - name: zookeeper
         ipv4_address: '172.26.10.3'
     etc_hosts: "{'zookeeper-1': '172.26.10.1', 'zookeeper-2': '172.26.10.2'}"
-    pre_build_image: true
     privileged: true
     tmpfs:
       - /run
       - /tmp
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     cgroupns_mode: host
+    command: '/usr/lib/systemd/systemd'
+    pre_build_image: true
     capabilities:
       - SYS_ADMIN
-    command: /lib/systemd/systemd
     groups:
       - zookeeper-nodes
 provisioner:

molecule/default/prepare.yml

@@ -4,27 +4,18 @@
   gather_facts: true
 
   pre_tasks:
-    - name: Install Java 8 (OpenJDK) on RedHat/CentOS
-      ansible.builtin.yum:
-        name: java-1.8.0-openjdk
-        state: installed
-      when: ansible_os_family == "RedHat"
-
     - name: Install python-firewall
       ansible.builtin.yum:
         name:
           - python3-firewall
-          - firewalld
         state: installed
-      when: ansible_distribution == "Rocky" and ansible_distribution_major_version == "8"
+      when: ansible_os_family == "RedHat"
 
-    - name: Install python-firewall
+    - name: Install Java 8 (OpenJDK) on RedHat/CentOS
       ansible.builtin.yum:
-        name:
-          - python-firewall
-          - firewalld
+        name: java-1.8.0-openjdk
         state: installed
-      when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
+      when: ansible_os_family == "RedHat"
 
     - name: Install Java 11 (OpenJDK) on Debian
       ansible.builtin.apt:
@@ -44,9 +35,8 @@
         state: present
       when: ansible_os_family == "Debian"
 
-    - name: Install ps on Rocky Linux
+    - name: Install ps on RedHat/CentOS
       ansible.builtin.yum:
         name: procps
         state: present
-        use_backend: dnf
-      when: ansible_distribution == "Rocky" and ansible_distribution_major_version == "8"
+      when: ansible_os_family == "RedHat"

templates/zookeeper.service.j2

@@ -11,6 +11,7 @@ ExecStart={{ zookeeper_dir }}/bin/zkServer.sh start
 ExecStop={{ zookeeper_dir }}/bin/zkServer.sh stop
 SuccessExitStatus=143
 Restart=on-failure
+RestartSec=5
 User={{ zookeeper_user }}
 Group={{ zookeeper_group }}