Removed Support for Retired Operating Systems

ansible-collections · Oct 22, 2023 · e945585 · e945585
1 parent 79af636
commit e945585
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 68 deletions.
diff --git a/changelogs/fragments/remove_os.yml b/changelogs/fragments/remove_os.yml
@@ -0,0 +1,2 @@
+breaking_changes:
+  - all roles - removed support for Ubuntu 18.04
diff --git a/roles/zabbix_agent/meta/main.yml b/roles/zabbix_agent/meta/main.yml
@@ -4,34 +4,22 @@ galaxy_info:
   description: Installing and maintaining zabbix-agent for RedHat/Debian/Ubuntu/Windows/Suse.
   company: myCompany.Dotcom
   license: MIT
-  min_ansible_version: 2.7
+  min_ansible_version: 2.14
   platforms:
     - name: EL
       versions:
-        - 5
-        - 6
         - 7
+        - 8
+        - 9
     - name: Ubuntu
       versions:
-        - lucid
-        - precise
-        - trusty
-        - xenial
-        - bionic
+        - focal
+        - jammy
     - name: Debian
       versions:
-        - squeeze
-        - wheezy
-        - jessie
-        - stretch
         - buster
-    - name: opensuse
-      versions:
-        - 12.1
-        - 12.2
-        - 12.3
-        - 13.1
-        - 13.2
+        - bullseye
+        - bookworm
     - name: Windows
       versions:
         - all

diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -17,18 +17,13 @@ zabbix_valid_agent_versions:
   "10":
     - 6.0
 
-  "9":
-    - 6.0
   # Ubuntu
   "22":
     - 6.0
 
   "20":
     - 6.0
 
-  "18":
-    - 6.0
-
 debian_keyring_path: /etc/apt/keyrings/
 zabbix_gpg_key: "{{ debian_keyring_path }}/zabbix-official-repo.asc"
 _zabbix_repo_deb_url: "http://repo.zabbix.com/zabbix/{{ zabbix_agent_version }}/{{ ansible_distribution.lower() }}"
diff --git a/roles/zabbix_javagateway/meta/main.yml b/roles/zabbix_javagateway/meta/main.yml
@@ -4,20 +4,20 @@ galaxy_info:
   description: Installing and maintaining zabbix-javagateway for RedHat/Debian/Ubuntu.
   company: myCompany.Dotcom
   license: license (GPLv3)
-  min_ansible_version: 2.4
+  min_ansible_version: 2.13
   platforms:
     - name: EL
       versions:
-        - 6
-        - 7
+        - 8
+        - 9
     - name: Ubuntu
       versions:
-        - lucid
-        - precise
-        - trusty
+        - focal
+        - jammy
     - name: Debian
       versions:
-        - squeeze
-        - wheezy
+        - buster
+        - bullseye
+        - bookworm
   galaxy_tags:
     - monitoring
diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
@@ -11,8 +11,6 @@ zabbix_valid_javagateway_versions:
     - 6.0
   "20":
     - 6.0
-  "18":
-    - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
 zabbix_gpg_key: "{{ debian_keyring_path }}/zabbix-official-repo.asc"

diff --git a/roles/zabbix_proxy/meta/main.yml b/roles/zabbix_proxy/meta/main.yml
@@ -4,22 +4,21 @@ galaxy_info:
   description: Installing and maintaining zabbix-proxy for RedHat/Debian/Ubuntu.
   company: myCompany.Dotcom
   license: MIT
-  min_ansible_version: 2.4
+  min_ansible_version: 2.13
   platforms:
     - name: EL
       versions:
-        - 6
-        - 7
+        - 8
+        - 9
     - name: Ubuntu
       versions:
-        - lucid
-        - precise
-        - trusty
+        - focal
+        - jammy
     - name: Debian
       versions:
-        - squeeze
-        - wheezy
-        - stretch
+        - buster
+        - bullseye
+        - bookworm
   galaxy_tags:
     - zabbix
     - monitoring

diff --git a/roles/zabbix_proxy/vars/Debian.yml b/roles/zabbix_proxy/vars/Debian.yml
@@ -19,10 +19,6 @@ zabbix_valid_proxy_versions:
     - 6.4
     - 6.2
     - 6.0
-  "18":
-    - 6.4
-    - 6.2
-    - 6.0
 
 mysql_client_pkgs:
   # Debian
@@ -42,9 +38,6 @@ mysql_client_pkgs:
   "20":
     - default-mysql-client
     - "{{ zabbix_python_prefix }}-mysqldb"
-  "18":
-    - default-mysql-client
-    - "{{ zabbix_python_prefix }}-mysqldb"
 
 mysql_plugin:
   "18": mysql_native_password

diff --git a/roles/zabbix_server/meta/main.yml b/roles/zabbix_server/meta/main.yml
@@ -4,21 +4,21 @@ galaxy_info:
   description: Installing and maintaining zabbix-server for RedHat/Debian/Ubuntu.
   company: myCompany.Dotcom
   license: MIT
-  min_ansible_version: 2.4
+  min_ansible_version: 2.14
   platforms:
     - name: EL
       versions:
-        - 6
-        - 7
+        - 8
+        - 9
     - name: Ubuntu
       versions:
-        - lucid
-        - precise
-        - trusty
+        - focal
+        - jammy
     - name: Debian
       versions:
-        - squeeze
-        - wheezy
+        - buster
+        - bullseye
+        - bookworm
   galaxy_tags:
     - zabbix
     - monitoring

diff --git a/roles/zabbix_web/meta/main.yml b/roles/zabbix_web/meta/main.yml
@@ -4,23 +4,21 @@ galaxy_info:
   description: Installing and maintaining zabbix-web for RedHat/Debian/Ubuntu.
   company: myCompany.Dotcom
   license: license (GPLv3)
-  min_ansible_version: 2.4
+  min_ansible_version: 2.14
   platforms:
     - name: EL
       versions:
-        - 6
-        - 7
+        - 8
+        - 9
     - name: Ubuntu
       versions:
-        - lucid
-        - precise
-        - trusty
+        - focal
+        - jammy
     - name: Debian
       versions:
-        - squeeze
-        - wheezy
-        - jessie
-        - stretch
+        - buster
+        - bullseye
+        - bookworm
   galaxy_tags:
     - monitoring
     - zabbix
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		breaking_changes:
		- all roles - removed support for Ubuntu 18.04
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,8 +11,6 @@ zabbix_valid_javagateway_versions: @@
         - 6.0
       "20":
         - 6.0
-      "18":
-        - 6.0
     debian_keyring_path: /etc/apt/keyrings/
     zabbix_gpg_key: "{{ debian_keyring_path }}/zabbix-official-repo.asc"
@@ Expand Down @@