From e85642f80c5d8aceeaaac7d2b88b4789c6bfe89e Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 10 Mar 2021 12:16:39 +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: I508c7aea34bb706b58fc69be8bfb6c06d50f2f40
---
 meta/main.yml            |  3 +-
 tasks/manila_install.yml |  2 +-
 vars/redhat.yml          |  4 +--
 vars/suse.yml            | 61 ----------------------------------------
 4 files changed, 5 insertions(+), 65 deletions(-)
 delete mode 100644 vars/suse.yml

diff --git a/meta/main.yml b/meta/main.yml
index 8308438..acea1f2 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -22,10 +22,11 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - stretch
+        - buster
     - name: Ubuntu
       versions:
         - bionic
+        - focal
   categories:
     - cloud
     - python
diff --git a/tasks/manila_install.yml b/tasks/manila_install.yml
index 2cff521..ebbecc4 100644
--- a/tasks/manila_install.yml
+++ b/tasks/manila_install.yml
@@ -29,7 +29,7 @@
   package:
     name: "{{ manila_package_list }}"
     state: "{{ manila_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 46293ff..82b8963 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -29,7 +29,7 @@ manila_service_distro_packages:
   - openstack-manila
   - python-manilaclient
   - python2-shade
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}"
+  - python3-systemd
   - uwsgi
   - uwsgi-python
 
@@ -42,7 +42,7 @@ manila_scheduler_distro_packages: []
 manila_share_distro_packages: []
 
 manila_share_deps_distro_packages:
-  - "qemu-img{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}"
+  - qemu-img
   - sqlite
 
 manila_lvm_share_distro_packages:
diff --git a/vars/suse.yml b/vars/suse.yml
deleted file mode 100644
index 56b89a6..0000000
--- a/vars/suse.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-# Copyright 2019, VEXXHOST, Inc.
-#
-# 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.
-
-# Common rpm packages
-manila_distro_packages:
-  - libffi-devel
-  - libkmod-devel
-  - libkmod2
-  - postgresql-devel
-  - libxslt-devel
-  - nfs-utils
-  - rpcbind
-  - rsync
-  - zlib-devel
-
-manila_service_distro_packages:
-  - openstack-manila
-  - python-manilaclient
-  - python-shade
-  - python-systemd
-  - uwsgi
-  - uwsgi-python
-
-manila_devel_distro_packages:
-  - git-core
-  - systemd-devel
-
-manila_api_distro_packages: []
-manila_scheduler_distro_packages: []
-manila_share_distro_packages: []
-
-manila_share_deps_distro_packages:
-  - qemu-tools
-  - sqlite3
-
-manila_lvm_share_distro_packages:
-  - device-mapper
-  - lvm2
-  - parted
-
-manila_rbd_share_distro_packages:
-  - ceph-fuse
-
-manila_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl
-  - cyrus-sasl-plain
-  - cyrus-sasl-digestmd5
-
-manila_uwsgi_bin: '/usr/sbin'