From 1a68c53fe0d0f32f11e33a5cda47a78a50540267 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 10 Feb 2020 16:40:26 +0100
Subject: [PATCH] CI: Add CentOS 8 ceph-ansible job

Change-Id: If354fbdeb2fd8d026faa0210b84da0a688c3ae0a
---
 tests/deploy-ceph-ansible.sh    | 11 ++++++-----
 tests/run.yml                   |  3 +++
 tests/templates/ceph-ansible.j2 |  2 ++
 zuul.d/project.yaml             |  3 +--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/deploy-ceph-ansible.sh b/tests/deploy-ceph-ansible.sh
index 9c4ef72975..43ce02fcf4 100755
--- a/tests/deploy-ceph-ansible.sh
+++ b/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
 }
diff --git a/tests/run.yml b/tests/run.yml
index 8af4bb5f72..2cab332838 100644
--- a/tests/run.yml
+++ b/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:
diff --git a/tests/templates/ceph-ansible.j2 b/tests/templates/ceph-ansible.j2
index 17aaf7f797..cf3d027cf7 100644
--- a/tests/templates/ceph-ansible.j2
+++ b/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
 
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 723d1911d4..c7e5ffcba3 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -47,8 +47,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