From d1fe516938e5e4d79178aa57f0317631f5f6ffbd Mon Sep 17 00:00:00 2001
From: Ryan Gard <ryan.gard@rackspace.com>
Date: Tue, 19 Feb 2019 15:00:22 -0800
Subject: [PATCH 1/2] ASC-1655 Enable Ceph Scenario

Update "run_mnaio_playbook" function to support Ceph as a backend when
depoying if the "RE_JOB_SCENARIO" is set to "ceph".
---
 gating/mnaio_vars.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gating/mnaio_vars.sh b/gating/mnaio_vars.sh
index 4c3e44865..624a41962 100644
--- a/gating/mnaio_vars.sh
+++ b/gating/mnaio_vars.sh
@@ -51,6 +51,11 @@ if [[ "${RPCO_IMAGES_AVAILABLE}" == "false" ]] || [[ "${RE_JOB_ACTION}" == "depl
   export DEPLOY_VMS="true"
 fi
 
+# Enable Ceph deployment if specified by the job scenario.
+if [[ "${RE_JOB_SCENARIO}" == "ceph" ]] ]]; then
+  export ENABLE_CEPH_STORAGE="true"
+fi
+
 #
 # Non-MNAIO RPC Specific settings
 #
@@ -95,6 +100,7 @@ function run_mnaio_playbook() {
                  -e container_tech=${CONTAINER_TECH:-"lxc"} \
                  -e ipxe_kernel_base_url=${IPXE_KERNEL_BASE_URL:-"http://boot.ipxe.org"} \
                  -e ipxe_path_url=${IPXE_PATH_URL:-""} ${MNAIO_ANSIBLE_PARAMETERS} \
+                 -e enable_ceph_storage=${ENABLE_CEPH_STORAGE:-"false"} \
                  --force-handlers \
                  --flush-cache \
                  $@

From 66ad733f823f57a13325686b2a4cc3450e3e50d5 Mon Sep 17 00:00:00 2001
From: "Dave Wilde (d34dh0r453)" <david.wilde@rackspace.com>
Date: Thu, 21 Feb 2019 09:49:23 -0600
Subject: [PATCH 2/2] Update tests

This pins the openstack-ansible-tests to a known working SHA.

(cherry picked from commit 284cf7a522cdf21da3fe6daec8d8014a0a039e1e)
---
 tox.ini | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index fab675b5b..0049ae024 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,8 +30,9 @@ setenv =
     # NOTE(cloudnull): This should be set to "master" as soon the gate is capable of
     #                  setting this option.
     OSA_RELEASE_BRANCH={env:OSA_RELEASE_BRANCH:master}
-    OSA_TEST_RELEASE=master
-    UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={env:OSA_TEST_RELEASE:master}
+    OSA_TEST_RELEASE=d90acf00b639496cd0669153534fe5588875f3ee
+    OSA_UPPER_CONSTRAINTS=377fde64ac16dc94da2e29e16a4102adcc081a6e
+    UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={env:OSA_UPPER_CONSTRAINTS:master}
     OSA_TEST_DEPS=https://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h={env:OSA_TEST_RELEASE:master}
     OSA_ROLE_REQUIREMENTS=https://git.openstack.org/cgit/openstack/openstack-ansible/plain/ansible-role-requirements.yml?h={env:OSA_RELEASE_BRANCH:master}
 basepython = python2.7
@@ -87,10 +88,10 @@ commands =
 commands =
     bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \
                git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \
-               pushd {toxinidir}/tests/common; \
-                 git checkout {env:OSA_TEST_RELEASE:master}; \
-               popd; \
-             fi"
+             fi; \
+             pushd {toxinidir}/tests/common; \
+               git checkout {env:OSA_TEST_RELEASE:master}; \
+             popd"
 
 
 [testenv:pep8]