Merge "CI: Add CentOS 8 ceph-ansible job"

tests/deploy-ceph-ansible.sh

@@ -7,12 +7,13 @@ set -o errexit
 export PYTHONUNBUFFERED=1
 
 function setup_ceph_ansible {
-    # FIXME(mnasiadka): Use python3 when we move to CentOS 8
-    # (there are no python3 selinux bindings for 3 on C7)
-    # see https://bugs.centos.org/view.php?id=16389
-
     # Prepare virtualenv for ceph-ansible deployment
-    virtualenv --system-site-packages ~/ceph-venv
+    # 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
     ~/ceph-venv/bin/pip install -Ir requirements.txt
     ~/ceph-venv/bin/pip install -IU selinux
 }

tests/run.yml

@@ -289,6 +289,9 @@
             cmd: deploy-ceph-ansible.sh
             executable: /bin/bash
             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:

tests/templates/ceph-ansible.j2

@@ -9,6 +9,8 @@ configure_firewall: false
 
 docker: true
 containerized_deployment: true
+container_binary: "docker"
+docker_pull_timeout: "600s"
 
 dashboard_enabled: false
 

zuul.d/project.yaml

@@ -46,8 +46,7 @@
         - kolla-ansible-centos8-source-mariadb
         - kolla-ansible-ubuntu-source-mariadb
         - kolla-ansible-centos-source-ceph-ansible
-        # FIXME(mgoddard): Ceph-ansible CentOS 8 job.
+        - kolla-ansible-centos8-source-ceph-ansible
-        # - kolla-ansible-centos8-source-ceph-ansible
         - kolla-ansible-ubuntu-source-ceph-ansible
         - kolla-ansible-centos-source-upgrade-ceph-ansible
         - kolla-ansible-ubuntu-source-upgrade-ceph-ansible