Remove support for CentOS 7

CentOS 8 support is now fairly complete - time to drop CentOS 7.

Partially-Implements: blueprint centos-rhel-8

Change-Id: I940b1d3eceb98e16fa366c243672f588b1412d70

3 files changed, 2 insertions, 19 deletions

diff --git a/tests/deploy-ceph-ansible.sh b/tests/deploy-ceph-ansible.sh
index 43ce02fcf..b018521f1 100755
--- a/tests/deploy-ceph-ansible.sh
+++ b/tests/deploy-ceph-ansible.sh
@@ -8,12 +8,7 @@ export PYTHONUNBUFFERED=1
 
 function setup_ceph_ansible {
     # Prepare virtualenv for ceph-ansible deployment
-    # NOTE(mnasiadka): Use python2 on centos7 due to missing python3 selinux bindings
-    if [[ $BASE_DISTRO == "centos" ]] && [[ $BASE_DISTRO_MAJOR_VERSION -eq 8 ]]; then
-        virtualenv --system-site-packages ~/ceph-venv
-    else
-        virtualenv -p `which python2` --system-site-packages ~/ceph-venv
-    fi
+    virtualenv --system-site-packages ~/ceph-venv
     ~/ceph-venv/bin/pip install -Ir requirements.txt
     ~/ceph-venv/bin/pip install -IU selinux
 }
diff --git a/tests/run.yml b/tests/run.yml
index 78eca7713..ee291715f 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -11,8 +11,6 @@
       vars:
         # NOTE(yoctozepto): needed here to use in other facts too
         openstack_core_enabled: "{{ scenario not in ['bifrost', 'mariadb'] }}"
-        # TODO(mgoddard): Remove when previous_release is ussuri.
-        is_centos8: "{{ ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 8 }}"
       set_fact:
         kolla_inventory_path: "/etc/kolla/inventory"
         logs_dir: "/tmp/logs"
@@ -26,7 +24,7 @@
         openstack_core_tested: "{{ scenario in ['core', 'ceph-ansible', 'zun', 'cells', 'swift', 'linuxbridge'] }}"
         dashboard_enabled: "{{ openstack_core_enabled }}"
         # TODO(mgoddard): Remove when previous_release is ussuri.
-        playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' and not is_centos8 else '3' }}"
+        playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' and ansible_os_family != 'RedHat' else '3' }}"
         upper_constraints_file: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
 
     - name: Install xfsprogs package for Swift filesystems
@@ -276,7 +274,6 @@
         chdir: "{{ kolla_ansible_src_dir }}"
       environment:
         BASE_DISTRO: "{{ base_distro }}"
-        BASE_DISTRO_MAJOR_VERSION: "{{ ansible_distribution_major_version }}"
         INSTALL_TYPE: "{{ install_type }}"
         BUILD_IMAGE: "{{ need_build_image }}"
         TAG: "{{ build_image_tag }}"
@@ -310,7 +307,6 @@
             chdir: "{{ ceph_ansible_src_dir }}"
           environment:
             BASE_DISTRO: "{{ base_distro }}"
-            BASE_DISTRO_MAJOR_VERSION: "{{ ansible_distribution_major_version }}"
 
         - name: Ensure required kolla config directories exist
           file:
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index e1217ba4b..b95efdb3f 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -1,12 +1,4 @@
 ---
-{% if ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7' %}
-# Force the use of python2 on CentOS7 remote hosts. This is necessary for
-# delegate_to: localhost, which will otherwise use the local python interpreter
-# (python3).  On CentOS 7, that fails due to a lack of python3 bindings for
-# SELinux.  https://bugs.centos.org/view.php?id=16389
-ansible_python_interpreter: /usr/bin/python2
-{% endif %}
-
 kolla_base_distro: "{{ base_distro }}"
 kolla_install_type: "{{ install_type }}"
 network_interface: "{{ api_interface_name }}"