Add support for Ubuntu 24.04 Noble Numbat (all roles) (#1221)

ansible-collections · May 18, 2024 · ea1edfb · ea1edfb
1 parent ef06198
commit ea1edfb
Show file tree

Hide file tree

Showing 29 changed files with 162 additions and 36 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -40,6 +41,8 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: ubuntu2404
+            version: v62
 
     steps:
       - name: Check out code

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -23,6 +23,7 @@ jobs:
           - rockylinux9
           - rockylinux8
           - centos7
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -40,6 +41,8 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: ubuntu2404
+            version: v62
         collection_role:
           - zabbix_javagateway
     steps:

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -23,6 +23,7 @@ jobs:
           - rockylinux9
           - rockylinux8
           - centos7
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -46,6 +47,8 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: ubuntu2404
+            version: v62
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -42,6 +43,8 @@ jobs:
             version: v62
           - container: debian10
             version: v62
+          - container: ubuntu2404
+            version: v62
           - container: ubuntu1804
             version: v62
           - container: ubuntu1804

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -45,6 +46,8 @@ jobs:
         exclude:
           - container: debian10
             version: v62
+          - container: ubuntu2404
+            version: v62
           - container: ubuntu1804
             version: v62
           - container: debian10

diff --git a/changelogs/fragments/1221-add_support_for_ubuntu_24.04.yml b/changelogs/fragments/1221-add_support_for_ubuntu_24.04.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - all roles - Added support for Ubuntu 24.04 (Noble Numbat)
diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
@@ -94,6 +94,7 @@ See the following list of supported Operating systems with the Zabbix releases:
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
 | Red Hat Fam 7       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |  V  |  V  |  V  |
@@ -119,7 +120,7 @@ The following is an overview of all available configuration default for this rol
 * `zabbix_agent_disable_repo`: A list of repos to disable during install.  Default `epel`.
 * `zabbix_repo_deb_url`: The URL to the Zabbix repository.  Default `http://repo.zabbix.com/zabbix/{{ zabbix_agent_version }}/{{ ansible_distribution.lower() }}`
 * `zabbix_repo_deb_component`: The repository component for Debian installs. Default `main`.
-* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key`.
+* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key` (or `https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg` for Ubuntu 24.04 repo).
 * `zabbix_repo_deb_include_deb_src`: True, if deb-src should be included in the zabbix.sources entry. Default `true`.
 
 ### SElinux

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -39,6 +39,7 @@ See the following list of supported Operating systems with the Zabbix releases.
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
 | Red Hat Fam 7       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |  V  |  V  |  V  |
@@ -64,7 +65,7 @@ The `zabbix_javagateway_version` is optional. The latest available major.minor v
 * `zabbix_javagateway_conf_mode`: Default: `0644`. The "mode" for the Zabbix configuration file.
 * `zabbix_repo_deb_url`: The URL to the Zabbix repository.  Default `http://repo.zabbix.com/zabbix/{{ zabbix_agent_version }}/{{ ansible_distribution.lower() }}`
 * `zabbix_repo_deb_component`: The repository component for Debian installs. Default `main`.
-* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key`.
+* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key` (or `https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg` for Ubuntu 24.04 repo).
 * `zabbix_repo_deb_include_deb_src`: True, if deb-src should be included in the zabbix.sources entry. Default `true`.
 
 ### Java Gatewaty

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -82,6 +82,7 @@ See the following list of supported Operating systems with the Zabbix releases.
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
 | Red Hat Fam 7       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |  V  |  V  |  V  |
@@ -135,7 +136,7 @@ The following is an overview of all available configuration default for this rol
 * `*zabbix_proxy_package_state`: Default: `present`. Can be overridden to `latest` to update packages
 * `zabbix_repo_deb_url`: The URL to the Zabbix repository.  Default `http://repo.zabbix.com/zabbix/{{ zabbix_proxy_version }}/{{ ansible_distribution.lower() }}`
 * `zabbix_repo_deb_component`: The repository component for Debian installs. Default `main`.
-* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key`.
+* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key` (or `https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg` for Ubuntu 24.04 repo).
 * `zabbix_repo_deb_include_deb_src`: True, if deb-src should be included in the zabbix.sources entry. Default `true`.
 
 ### SElinux

diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
@@ -79,6 +79,7 @@ See the following list of supported Operating systems with the Zabbix releases:
 |---------------------|-----|-----|-----|
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |     |     |  V  |
@@ -111,7 +112,7 @@ The following is an overview of all available configuration default for this rol
 * `zabbix_service_enabled`: Default: `True` Can be overridden to `False` if needed
 * `zabbix_repo_deb_url`: The URL to the Zabbix repository.  Default `http://repo.zabbix.com/zabbix/{{ zabbix_server_version }}/{{ ansible_distribution.lower() }}`
 * `zabbix_repo_deb_component`: The repository component for Debian installs. Default `main`.
-* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key`.
+* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key` (or `https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg` for Ubuntu 24.04 repo).
 * `zabbix_repo_deb_include_deb_src`: True, if deb-src should be included in the zabbix.sources entry. Default `true`.
 
 ### SElinux

diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md
@@ -59,6 +59,7 @@ See the following list of supported Operating Systems with the Zabbix releases.
 |---------------------|-----|-----|-----|
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |     |     |  V  |
@@ -97,7 +98,7 @@ The following is an overview of all available configuration defaults for this ro
 * `zabbix_web_conf_mode`: Default: `0644`. The "mode" for the Zabbix configuration file.
 * `zabbix_repo_deb_url`: The URL to the Zabbix repository.  Default `http://repo.zabbix.com/zabbix/{{ zabbix_web_version }}/{{ ansible_distribution.lower() }}`
 * `zabbix_repo_deb_component`: The repository component for Debian installs. Default `main`.
-* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key`.
+* `zabbix_repo_deb_gpg_key_url`: The URL to download the Zabbix GPG key from. Default `http://repo.zabbix.com/zabbix-official-repo.key` (or `https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg` for Ubuntu 24.04 repo).
 * `zabbix_repo_deb_include_deb_src`: True, if deb-src should be included in the zabbix.sources entry. Default `true`.
 
 ### Zabbix Web specific

diff --git a/molecule/requirements.txt b/molecule/requirements.txt
@@ -1,7 +1,7 @@
 # Install CI dependencies for the Zabbix Roles
-ansible==7.0.0
+#ansible==8.0.0  # commented out to avoid installing collections in site-packages/ansible_collections
 ansible-compat==3.0.0
-ansible-core==2.14.2
+ansible-core==2.15.11
 docker==6.1.3
 molecule<5
 molecule-docker @ git+https://github.com/ansible-community/molecule-docker@main

diff --git a/molecule/zabbix_web/prepare.yml b/molecule/zabbix_web/prepare.yml
@@ -83,7 +83,7 @@
       when: ansible_version.full is version("2.14", "<")
 
     - name: "Apt update"
-      ansible.builtin.shell: "apt-get update && echo exit 0 > /usr/sbin/policy-rc.d"
+      ansible.builtin.shell: "apt-get update"
       args:
         warn: "{{ produce_warn | default(omit) }}"
       register: installation_dependencies
@@ -162,7 +162,14 @@
         - ansible_distribution_major_version >= '22'
         - ansible_os_family == "Debian"
 
-    - name: Set PHP packages (Ubuntu 2204)
+    - name: Set PHP Version (Ubuntu 2404)
+      ansible.builtin.set_fact:
+        __php_default_version_debian: "8.3"
+      when:
+        - ansible_distribution_major_version >= '24'
+        - ansible_os_family == "Debian"
+
+    - name: Set PHP packages (Ubuntu 2204 & 2404)
       ansible.builtin.set_fact:
         __php_packages:
           - php{{ __php_default_version_debian }}-common

diff --git a/roles/zabbix_agent/defaults/main.yml b/roles/zabbix_agent/defaults/main.yml
@@ -18,7 +18,6 @@ zabbix_agent_tlspskidentity_file: "/etc/zabbix/tls_psk_auto.identity"
 # Selinux related vars
 selinux_allow_zabbix_run_sudo: false
 
-zabbix_repo_deb_gpg_key_url: http://repo.zabbix.com/zabbix-official-repo.key
 zabbix_repo_deb_include_deb_src: true
 
 zabbix_agent_install_agent_only: false

diff --git a/roles/zabbix_agent/tasks/Debian.yml b/roles/zabbix_agent/tasks/Debian.yml
@@ -40,8 +40,8 @@
 - name: "Debian | Download gpg key"
   when: not ansible_check_mode # Because get_url always has changed status in check_mode.
   ansible.builtin.get_url:
-    url: "{{ zabbix_repo_deb_gpg_key_url }}"
-    dest: "{{ zabbix_gpg_key }}"
+    url: "{{ zabbix_repo_deb_gpg_key_url | default(_zabbix_repo_default_deb_gpg_key_url_by_distrib[ansible_distribution_major_version]) }}"
+    dest: "{{ zabbix_gpg_key | default(_zabbix_gpg_key_default_by_distrib[ansible_distribution_major_version]) }}"
     mode: "0644"
     force: true
   environment:
@@ -64,7 +64,7 @@
       Suites: {{ ansible_distribution_release }}
       Components: {{ zabbix_repo_deb_component }}
       Architectures: {{ 'amd64' if ansible_machine != 'aarch64' else 'arm64'}}
-      Signed-By: {{ zabbix_gpg_key }}
+      Signed-By: {{ zabbix_gpg_key | default(_zabbix_gpg_key_default_by_distrib[ansible_distribution_major_version]) }}
   become: true
   tags:
     - install

diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -25,6 +25,10 @@ zabbix_valid_agent_versions:
     - 6.2
     - 6.0
   # Ubuntu
+  "24":
+    - 6.4
+    - 6.0
+
   "22":
     - 6.4
     - 6.2
@@ -41,4 +45,21 @@ zabbix_valid_agent_versions:
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
-zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc"
+_zabbix_gpg_key_default_by_distrib:
+  "12": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "11": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "10": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "9": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "24": "{{ debian_keyring_path }}zabbix-repo.gpg"
+  "22": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "20": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "18": "{{ debian_keyring_path }}zabbix-repo.asc"
+_zabbix_repo_default_deb_gpg_key_url_by_distrib:
+  "12": https://repo.zabbix.com/zabbix-official-repo.key
+  "11": https://repo.zabbix.com/zabbix-official-repo.key
+  "10": https://repo.zabbix.com/zabbix-official-repo.key
+  "9": https://repo.zabbix.com/zabbix-official-repo.key
+  "24": https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg
+  "22": https://repo.zabbix.com/zabbix-official-repo.key
+  "20": https://repo.zabbix.com/zabbix-official-repo.key
+  "18": https://repo.zabbix.com/zabbix-official-repo.key
diff --git a/roles/zabbix_javagateway/defaults/main.yml b/roles/zabbix_javagateway/defaults/main.yml
@@ -33,5 +33,4 @@ zabbix_javagateway_listenip: 0.0.0.0
 zabbix_javagateway_listenport: 10052
 zabbix_javagateway_startpollers: 5
 
-zabbix_repo_deb_gpg_key_url: http://repo.zabbix.com/zabbix-official-repo.key
 zabbix_repo_deb_include_deb_src: true
diff --git a/roles/zabbix_javagateway/tasks/Debian.yml b/roles/zabbix_javagateway/tasks/Debian.yml
@@ -21,8 +21,8 @@
 - name: "Debian | Download gpg key"
   when: not ansible_check_mode  # Because get_url always has changed status in check_mode.
   ansible.builtin.get_url:
-    url: "{{ zabbix_repo_deb_gpg_key_url }}"
-    dest: "{{ zabbix_gpg_key }}"
+    url: "{{ zabbix_repo_deb_gpg_key_url | default(_zabbix_repo_default_deb_gpg_key_url_by_distrib[ansible_distribution_major_version]) }}"
+    dest: "{{ zabbix_gpg_key | default(_zabbix_gpg_key_default_by_distrib[ansible_distribution_major_version]) }}"
     mode: "0644"
     force: true
   environment:
@@ -45,11 +45,16 @@
       Suites: {{ ansible_distribution_release }}
       Components: {{ zabbix_repo_deb_component }}
       Architectures: {{ 'amd64' if ansible_machine != 'aarch64' else 'arm64'}}
-      Signed-By: {{ zabbix_gpg_key }}
+      Signed-By: {{ zabbix_gpg_key | default(_zabbix_gpg_key_default_by_distrib[ansible_distribution_major_version]) }}
+  register: zabbix_repo
   become: true
   tags:
     - install
 
+- name: "Debian | Update apt cache if repo was added"
+  ansible.builtin.apt: update_cache=yes
+  when: zabbix_repo is changed
+
 - name: "Debian | Installing zabbix-java-gateway"
   ansible.builtin.apt:
     pkg: zabbix-java-gateway

diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
@@ -12,6 +12,9 @@ zabbix_valid_javagateway_versions:
     - 6.2
     - 6.0
   # Ubuntu
+  "24":
+    - 6.4
+    - 6.0
   "22":
     - 6.4
     - 6.2
@@ -26,4 +29,19 @@ zabbix_valid_javagateway_versions:
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
-zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc"
+_zabbix_gpg_key_default_by_distrib:
+  "12": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "11": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "10": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "24": "{{ debian_keyring_path }}zabbix-repo.gpg"
+  "22": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "20": "{{ debian_keyring_path }}zabbix-repo.asc"
+  "18": "{{ debian_keyring_path }}zabbix-repo.asc"
+_zabbix_repo_default_deb_gpg_key_url_by_distrib:
+  "12": https://repo.zabbix.com/zabbix-official-repo.key
+  "11": https://repo.zabbix.com/zabbix-official-repo.key
+  "10": https://repo.zabbix.com/zabbix-official-repo.key
+  "24": https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg
+  "22": https://repo.zabbix.com/zabbix-official-repo.key
+  "20": https://repo.zabbix.com/zabbix-official-repo.key
+  "18": https://repo.zabbix.com/zabbix-official-repo.key
diff --git a/roles/zabbix_proxy/defaults/main.yml b/roles/zabbix_proxy/defaults/main.yml
@@ -62,7 +62,6 @@ zabbix_repo_yum:
     state: present
 zabbix_proxy_apt_priority:
 zabbix_proxy_package_state: present
-zabbix_repo_deb_gpg_key_url: http://repo.zabbix.com/zabbix-official-repo.key
 zabbix_repo_deb_include_deb_src: true
 
 # Proxy Configuration Variables (Only ones with role provided defaults)

diff --git a/roles/zabbix_proxy/tasks/Debian.yml b/roles/zabbix_proxy/tasks/Debian.yml
@@ -46,8 +46,8 @@
 - name: "Debian | Download gpg key"
   when: not ansible_check_mode  # Because get_url always has changed status in check_mode.
   ansible.builtin.get_url:
-    url: "{{ zabbix_repo_deb_gpg_key_url }}"
-    dest: "{{ zabbix_gpg_key }}"
+    url: "{{ zabbix_repo_deb_gpg_key_url | default(_zabbix_repo_default_deb_gpg_key_url_by_distrib[ansible_distribution_major_version]) }}"
+    dest: "{{ zabbix_gpg_key | default(_zabbix_gpg_key_default_by_distrib[ansible_distribution_major_version]) }}"
     mode: "0644"
     force: true
   environment:
@@ -72,7 +72,7 @@
       Suites: {{ ansible_distribution_release }}
       Components: {{ zabbix_repo_deb_component }}
       Architectures: {{ 'amd64' if ansible_machine != 'aarch64' else 'arm64'}}
-      Signed-By: {{ zabbix_gpg_key }}
+      Signed-By: {{ zabbix_gpg_key | default(_zabbix_gpg_key_default_by_distrib[ansible_distribution_major_version]) }}
   become: true
   tags:
     - install