Support zabbix_agent >= 6.0 for Ubuntu 22.04 (#681)

* Support zabbix_agent >= 6.0 for Ubuntu 22.04 * Fix typo & add link to upstream for Ubuntu 22.04
ansible-collections · Apr 30, 2022 · ab5cf40 · ab5cf40
1 parent b2d3008
commit ab5cf40
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/roles/zabbix_agent/tasks/main.yml b/roles/zabbix_agent/tasks/main.yml
@@ -11,6 +11,16 @@
   tags:
     - always
 
+- name: "Reset zabbix_agent_version for Ubuntu 22.04 to 6.0"
+  # README https://support.zabbix.com/browse/ZBXNEXT-7624
+  set_fact:
+    zabbix_version: 6.0
+    zabbix_agent_version: 6.0
+  when:
+    - ansible_distribution_release == "jammy"
+    - ( zabbix_agent_version is version ('6.0','lt') or
+        zabbix_version is version ('6.0','lt') )
+
 - name: "Fix facts for linuxmint - distribution release"
   set_fact:
     zabbix_agent_distribution_release: xenial

diff --git a/roles/zabbix_agent/vars/zabbix.yml b/roles/zabbix_agent/vars/zabbix.yml
@@ -7,6 +7,8 @@ sign_keys:
       sign_key: E709712C
     stretch:
       sign_key: E709712C
+    jammy:
+      sign_key: E709712C
     focal:
       sign_key: E709712C
     bionic:
@@ -24,6 +26,8 @@ sign_keys:
       sign_key: E709712C
     stretch:
       sign_key: E709712C
+    jammy:
+      sign_key: E709712C
     focal:
       sign_key: E709712C
     bionic:
@@ -42,6 +46,8 @@ sign_keys:
       sign_key: E709712C
     stretch:
       sign_key: E709712C
+    jammy:
+      sign_key: E709712C
     focal:
       sign_key: E709712C
     bionic:
@@ -61,6 +67,8 @@ sign_keys:
       sign_key: E709712C
     stretch:
       sign_key: E709712C
+    jammy:
+      sign_key: E709712C
     focal:
       sign_key: E709712C
     bionic: