From 712641e32cf314b056ef02215fc1f073995d41f3 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Tue, 16 Mar 2021 08:46:25 +0000
Subject: [PATCH] Remove references to unsupported operating systems

All references to Gentoo, SUSE, Debian stretch and Centos-7  are removed.
Conditional tasks, ternary operators and variables are simplified where possible
OS specific variables files are generalised where possible

Change-Id: Ic1b8b532adec2c46373d3a0a3cea8387bff7817a
---
 meta/main.yml                    | 10 ++++----
 tasks/install_zypper.yml         | 40 --------------------------------
 tasks/rabbitmq_install.yml       |  5 ++--
 tasks/rabbitmq_upgrade_check.yml |  5 ++--
 4 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 tasks/install_zypper.yml

diff --git a/meta/main.yml b/meta/main.yml
index ade49e38..1bae9f4c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -22,16 +22,14 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - stretch
+        - buster
     - name: Ubuntu
       versions:
-        - xenial
+        - bionic
+        - focal
     - name: EL
       versions:
-        - 7
-    - name: opensuse
-      versions:
-        - 15
+        - 8
   galaxy_tags:
     - cloud
     - rabbitmq
diff --git a/tasks/install_zypper.yml b/tasks/install_zypper.yml
deleted file mode 100644
index ae2eb59e..00000000
--- a/tasks/install_zypper.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-# Copyright 2017, SUSE LINUX GmbH.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Fail if installation method is not 'external_repo'
-  fail:
-    msg: "The only supported rabbitmq_install_method for openSUSE is 'external_repo'."
-  when: rabbitmq_install_method != 'external_repo'
-
-- name: Configure repositories
-  zypper_repository:
-    name: "{{ item.name }}"
-    description: "{{ item.description }}"
-    repo: "{{ item.baseurl }}"
-    disable_gpg_check: "{{ item.gpgcheck | default('yes') }}"
-  with_items:
-    - "{{ rabbitmq_erlang_repo }}"
-    - "{{ rabbitmq_repo }}"
-  tags:
-    - rabbitmq-repos
-
-- name: Install RabbitMQ packages
-  zypper:
-    name: "{{ rabbitmq_distro_packages }}"
-    state: "{{ rabbitmq_package_state }}"
-  register: install_rabbitmq
-  tags:
-    - rabbitmq-package-rpm
-    - rabbitmq-zypper-packages
diff --git a/tasks/rabbitmq_install.yml b/tasks/rabbitmq_install.yml
index 05f9f4e5..b67f4f4f 100644
--- a/tasks/rabbitmq_install.yml
+++ b/tasks/rabbitmq_install.yml
@@ -18,7 +18,7 @@
 - include_tasks: "install_{{ ansible_facts['pkg_mgr'] }}.yml"
   tags:
     - rabbitmq-apt-packages
-    - rabbitmq-yum-packages
+    - rabbitmq-dnf-packages
     - rabbitmq_server-install
 
 - name: Reload the systemd daemon
@@ -28,8 +28,7 @@
     - install_rabbitmq is changed
   tags:
     - rabbitmq-apt-packages
-    - rabbitmq-yum-packages
-    - rabbimtq-zypper-packages
+    - rabbitmq-dnf-packages
     - rabbitmq_server-install
 
 - name: Ensure there are no policy-rc files
diff --git a/tasks/rabbitmq_upgrade_check.yml b/tasks/rabbitmq_upgrade_check.yml
index 4afae0cd..03525b1e 100644
--- a/tasks/rabbitmq_upgrade_check.yml
+++ b/tasks/rabbitmq_upgrade_check.yml
@@ -41,11 +41,10 @@
   register: installed_rabbitmq_rpm
   when:
     - not rabbitmq_upgrade | bool
-    - ansible_facts['pkg_mgr'] in ['yum', 'dnf', 'zypper']
+    - ansible_facts['pkg_mgr'] == 'dnf'
   tags:
     - rabbitmq-package-rpm
-    - rabbitmq-yum-packages
-    - rabbitmq-zypper-packages
+    - rabbitmq-dnf-packages
     - skip_ansible_lint
 
 - name: Register a fact for the installed RabbitMQ version