From a10d00766e6373a8a8b854a7c37f719d5b35116f Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Tue, 16 Mar 2021 17:34:15 +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: If9dfa6aaa1e90856c6a4c074fd33b8e49b57a5fc
---
 meta/main.yml              |  7 ++---
 tasks/haproxy_apparmor.yml | 52 --------------------------------------
 tasks/haproxy_install.yml  |  2 --
 vars/suse.yml              | 21 ---------------
 4 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 tasks/haproxy_apparmor.yml
 delete mode 100644 vars/suse.yml

diff --git a/meta/main.yml b/meta/main.yml
index 987ffd7..1f6e307 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -22,17 +22,14 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - stretch
+        - buster
     - name: Ubuntu
       versions:
         - bionic
-        - xenial
+        - focal
     - name: EL
       versions:
         - 8
-    - name: opensuse
-      versions:
-        - 15
   categories:
     - cloud
     - python
diff --git a/tasks/haproxy_apparmor.yml b/tasks/haproxy_apparmor.yml
deleted file mode 100644
index 85e8a8e..0000000
--- a/tasks/haproxy_apparmor.yml
+++ /dev/null
@@ -1,52 +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.
-
-- name: Check for apparmor profile
-  stat:
-    path: "/etc/apparmor.d/usr.sbin.haproxy"
-  register: sbin_haproxy
-
-# NOTE(hwoarang) aa-disable will disable the profile and unload it immediately
-# See https://bugzilla.opensuse.org/show_bug.cgi?id=1108688. For aa-disable to
-# work we need apparmor app and running
-- name: Relax apparmor profile
-  block:
-    - name: Ensure apparmor service is running
-      systemd:
-        name: "apparmor"
-        enabled: yes
-        state: "started"
-
-    - name: Relax haproxy apparmor profile
-      shell: |
-        # empty line to workaround bug in EnvVarsInCommandRule.py lint test
-        # https://github.com/willthames/ansible-lint/issues/275
-        exit_code=0
-        if aa-status | grep -q haproxy; then
-          aa-disable usr.sbin.haproxy
-          exit_code=$?
-          if [[ ${exit_code} == 0 ]]; then
-            exit_code=2
-          fi
-        fi
-        exit ${exit_code}
-      register: _apparmor_profile_disabled
-      changed_when: _apparmor_profile_disabled.rc == 2
-      failed_when: _apparmor_profile_disabled.rc not in [0, 2]
-      args:
-        warn: no
-        executable: /bin/bash
-  when:
-    - sbin_haproxy.stat.exists | bool
diff --git a/tasks/haproxy_install.yml b/tasks/haproxy_install.yml
index 3427158..bb7e457 100644
--- a/tasks/haproxy_install.yml
+++ b/tasks/haproxy_install.yml
@@ -58,5 +58,3 @@
         remote_src: yes
   when: haproxy_hatop_install | bool
 
-- include_tasks: haproxy_apparmor.yml
-  when: ansible_facts['pkg_mgr'] == 'zypper'
diff --git a/vars/suse.yml b/vars/suse.yml
deleted file mode 100644
index bc77b01..0000000
--- a/vars/suse.yml
+++ /dev/null
@@ -1,21 +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.
-
-haproxy_distro_packages:
-  - apparmor-parser
-  - apparmor-profiles
-  - apparmor-utils
-  - haproxy
-  - netcat # Used for the Ansible haproxy module