From 22b5051802374b719bc13a912f0c1888f5dc5bb0 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 10 Mar 2021 12:16:38 +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: I1a9fd61f8690621144fc26eec762527d6ffcc33c
---
 meta/main.yml          |  9 +++------
 tasks/heat_install.yml |  2 +-
 vars/redhat.yml        |  2 +-
 vars/suse.yml          | 35 -----------------------------------
 4 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 vars/suse.yml

diff --git a/meta/main.yml b/meta/main.yml
index 532b4fc..0dcc911 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -22,17 +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
   categories:
     - cloud
     - python
diff --git a/tasks/heat_install.yml b/tasks/heat_install.yml
index 38a37be..9071305 100644
--- a/tasks/heat_install.yml
+++ b/tasks/heat_install.yml
@@ -29,7 +29,7 @@
   package:
     name: "{{ heat_package_list }}"
     state: "{{ heat_package_state }}"
-    update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
+    update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
     cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
   register: install_packages
   until: install_packages is success
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 5d1bbc4..b1e16dc 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -28,7 +28,7 @@ heat_service_distro_packages:
   - openstack-heat-api-cfn
   - openstack-heat-engine
   - openstack-heat-ui
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}"
+  - python3-systemd
 
 heat_oslomsg_amqp1_distro_packages:
   - cyrus-sasl-lib
diff --git a/vars/suse.yml b/vars/suse.yml
deleted file mode 100644
index ac35244..0000000
--- a/vars/suse.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# Copyright 2018, 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.
-
-heat_distro_packages:
-  - rsync
-  - libxslt1
-  - openmpi
-
-heat_devel_distro_packages:
-  - systemd-devel
-
-heat_service_distro_packages:
-  - openstack-heat
-  - openstack-heat-api
-  - openstack-heat-api-cfn
-  - openstack-heat-engine
-  - openstack-heat-templates
-  - python-systemd
-
-heat_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl
-  - cyrus-sasl-plain
-  - cyrus-sasl-digestmd5