Merge pull request #52 from sleighzy/upgrade-to-zookeeper-3.9.2

Upgrade to Zookeeper 3.9.2
sleighzy · Aug 29, 2024 · 3d2f890 · 3d2f890
2 parents 23dc5f7 + f7b4e6e
commit 3d2f890
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ See <https://github.com/ansible/ansible/issues/71528> for more information.
 | Variable                                 | Default                                                           | Comment                                                        |
 | ---------------------------------------- | ----------------------------------------------------------------- | -------------------------------------------------------------- |
 | zookeeper_mirror                         | <https://dlcdn.apache.org/zookeeper>                              |                                                                |
-| zookeeper_version                        | 3.9.1                                                             |                                                                |
+| zookeeper_version                        | 3.9.2                                                             |                                                                |
 | zookeeper_package                        | apache-zookeeper-{{ zookeeper_version }}-bin.tar.gz               |                                                                |
 | zookeeper_group                          | zookeeper                                                         |                                                                |
 | zookeeper_user                           | zookeeper                                                         |                                                                |

diff --git a/defaults/main.yaml b/defaults/main.yaml
@@ -1,7 +1,7 @@
 ---
 # Installation variables
 
-zookeeper_version: 3.9.1
+zookeeper_version: 3.9.2
 zookeeper_mirror: https://dlcdn.apache.org/zookeeper
 zookeeper_package: apache-zookeeper-{{ zookeeper_version }}-bin.tar.gz
 

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -32,40 +32,49 @@ platforms:
     groups:
       - zookeeper-nodes
   - name: zookeeper-2
-    image: rockylinux:8
+    image: geerlingguy/docker-debian10-ansible:latest
+    docker_networks:
+      - name: zookeeper
+        ipam_config:
+          - subnet: '172.26.0.0/16'
     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: rockylinux:8
+    image: geerlingguy/docker-debian10-ansible:latest
+    docker_networks:
+      - name: zookeeper
+        ipam_config:
+          - subnet: '172.26.0.0/16'
     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:

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -16,12 +16,12 @@
           - "'zookeeper' in getent_passwd"
           - "'zookeeper' in getent_group"
 
-    - name: Register '/usr/share/apache-zookeeper-3.9.1' installation directory status
+    - name: Register '/usr/share/apache-zookeeper-3.9.2' installation directory status
       ansible.builtin.stat:
-        path: '/usr/share/apache-zookeeper-3.9.1'
+        path: '/usr/share/apache-zookeeper-3.9.2'
       register: install_dir
 
-    - name: Assert that '/usr/share/apache-zookeeper-3.9.1' directory is created
+    - name: Assert that '/usr/share/apache-zookeeper-3.9.2' directory is created
       ansible.builtin.assert:
         that:
           - install_dir.stat.exists
@@ -39,7 +39,7 @@
         that:
           - zookeeper_dir.stat.exists
           - zookeeper_dir.stat.islnk
-          - zookeeper_dir.stat.lnk_target == '/usr/share/apache-zookeeper-3.9.1'
+          - zookeeper_dir.stat.lnk_target == '/usr/share/apache-zookeeper-3.9.2'
 
     - name: Register '/etc/zookeeper' directory status
       ansible.builtin.stat: