From a0a07a43ac83a60e2f592e83ef1a596efc97b939 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: Ia73e88947f52a74d9c03a17a7b1201a6346b5ac3
---
 handlers/main.yml                       | 10 ----
 meta/main.yml                           |  9 +--
 tasks/ironic_conductor_post_install.yml | 10 ----
 vars/redhat.yml                         |  6 +-
 vars/suse.yml                           | 78 -------------------------
 5 files changed, 6 insertions(+), 107 deletions(-)
 delete mode 100644 vars/suse.yml

diff --git a/handlers/main.yml b/handlers/main.yml
index 52116265..5cbc75f2 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -23,16 +23,6 @@
   listen:
     - "venv changed"
 
-- name: Restart tftpd socket
-  service:
-    name: "{{ ironic_tftpd_service_name }}.socket"
-    state: restarted
-    enabled: yes
-    daemon_reload: yes
-  failed_when: false
-  when:
-    - "ansible_pkg_mgr in ['zypper']"
-
 - name: Restart tftpd
   service:
     name: "{{ ironic_tftpd_service_name }}"
diff --git a/meta/main.yml b/meta/main.yml
index 18deb303..95f78faa 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
-    - name: opensuse
-      versions:
-        - 15
+        - focal
     - name: EL
       versions:
-      - 7
+      - 8
   categories:
     - cloud
     - baremetal
diff --git a/tasks/ironic_conductor_post_install.yml b/tasks/ironic_conductor_post_install.yml
index 9ac83821..7f8f937b 100644
--- a/tasks/ironic_conductor_post_install.yml
+++ b/tasks/ironic_conductor_post_install.yml
@@ -52,16 +52,6 @@
     remote_src: True
   with_items: "{{ ironic_library_modules_paths }}"
 
-# Add 'yum' in condition if tftp socket required to be started for centos.
-- name: Start up tftp socket
-  when:
-    - "ansible_pkg_mgr in ['zypper']"
-  systemd:
-    daemon_reload: yes
-    name: "{{ ironic_tftpd_service_name }}.socket"
-    state: started
-    enabled: true
-
 - name: Start up tftp
   service:
     name: "{{ ironic_tftpd_service_name }}"
diff --git a/vars/redhat.yml b/vars/redhat.yml
index c6144e3e..705cad5c 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -22,14 +22,14 @@ ironic_devel_distro_packages:
 
 ironic_api_distro_packages:
   - libxml2-devel
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}"
+  - python3-systemd
 
 ironic_conductor_distro_packages:
   - libxml2-devel
-  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('syslinux-devel', 'syslinux') }}"
+  - syslinux
   - syslinux-tftpboot
   - libxslt-devel
-  - "qemu-kvm{% if ansible_distribution_major_version is version('8', '<') %}-ev{% endif %}"
+  - qemu-kvm
   - libiscsi-utils
   - iscsi-initiator-utils
   - ipmitool
diff --git a/vars/suse.yml b/vars/suse.yml
deleted file mode 100644
index 4734e1f2..00000000
--- a/vars/suse.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-# Copyright 2019, SUSE
-#
-# 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.
-
-cache_timeout: 600
-
-ironic_devel_distro_packages:
-  - git-core
-  - libffi-devel
-  - systemd-devel
-
-ironic_api_distro_packages:
-  - libxml2-devel
-  - python-systemd
-
-ironic_conductor_distro_packages:
-  - ipmitool
-  - ipxe-bootimgs
-  - libxml2-devel
-  - libxslt-devel
-  - open-iscsi
-  - postgresql-devel
-  - python-yaml
-  - qemu-tools
-  - syslinux
-  - tftp
-  - gptfdisk
-  - nginx
-
-ironic_conductor_standalone_distro_packages:
-  - dhcp-server
-
-ironic_library_modules_paths:
-  - "/usr/share/syslinux/pxelinux.0"
-  - "/usr/share/syslinux/chain.c32"
-  - "/usr/share/syslinux/linux.c32"
-
-ironic_tftpd_service_name: tftp
-ironic_tftpd_root: /srv/tftpboot
-
-ironic_inspector_http_distro_packages:
-   - nginx
-
-ironic_inspector_isc_dhcp_distro_packages:
-   - tftpd-hpa
-   - isc-dhcp-server
-
-ironic_inspector_dnsmasq_distro_packages:
-   - dnsmasq
-
-ironic_inspector_standalone_distro_packages:
-  - isc-dhcp-server
-
-ironic_inspector_devel_distro_packages:
-  - git-core
-  - libffi-dev
-  - libsystemd-dev
-
-ironic_inspector_library_modules_paths:
-  - "/usr/lib/PXELINUX/pxelinux.0"
-  - "/usr/lib/PXELINUX/lpxelinux.0"
-  - "/usr/lib/syslinux/modules/efi64/chain.c32"
-  - "/usr/lib/syslinux/modules/bios/ldlinux.c32"
-  - "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi"
-  - "/usr/lib/syslinux/modules/efi64/ldlinux.e64"
-
-ironic_nginx_conf_path: "conf.d"