From cad7cb522e44e9218227f23c9ab4a4a1f86eb8bc Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 2 Jan 2020 16:45:21 -0700
Subject: [PATCH] Add tripleo-operator-ansible to install

As we look to move the core tripleo actions to a provided collection, we
need to perform the install at the same time as we do for
quickstart-extras.  This change adds tripleo-operator-extras to the
quickstart-extras-requirements.txt and adds a zuul cloner line for use
in CI.

Depends-On: https://review.opendev.org/#/c/701062/
Related-Blueprint: tripleo-operator-ansible
Change-Id: Ib4d700628287810c72ae03c7d27058e7042fd1e4
---
 quickstart-extras-requirements.txt |  1 +
 quickstart.sh                      | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/quickstart-extras-requirements.txt b/quickstart-extras-requirements.txt
index c13a2b9f1..66ac8b6d8 100644
--- a/quickstart-extras-requirements.txt
+++ b/quickstart-extras-requirements.txt
@@ -5,6 +5,7 @@ git+https://opendev.org/openstack/openstack-ansible-os_tempest/#egg=openstack-an
 git+https://opendev.org/openstack/ansible-role-python_venv_build/#egg=ansible-role-python_venv_build
 git+https://opendev.org/openstack/ansible-config_template/#egg=ansible-config_template
 git+https://opendev.org/openstack/ansible-role-collect-logs/#egg=ansible-role-collect-logs
+git+https://opendev.org/openstack/tripleo-operator-ansible/#egg=tripleo-operator-ansible
 # let's experiment with an alternative method to include the role
 # See:
 # https://review.opendev.org/673926
diff --git a/quickstart.sh b/quickstart.sh
index f94e64130..7be7a507a 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -139,17 +139,31 @@ bootstrap () {
             mkdir -p .tmp
             EXTRAS_DIR=$(/bin/mktemp -d -p $(pwd)/.tmp)
             pushd $EXTRAS_DIR
+                # pull in tripleo-operator-ansible from source
+                $ZUUL_CLONER --cache-dir \
+                    /opt/git \
+                    https://opendev.org \
+                    openstack/tripleo-operator-ansible
+                pushd openstack/tripleo-operator-ansible
+                if [ $OPT_CLEAN == 1 ]; then
+                    $(python_cmd) -m pip install --no-cache-dir --force-reinstall .
+                else
+                    $(python_cmd) -m pip install --force-reinstall .
+                fi
+                popd
+
+                # pull in tripleo-quickstart-extras from source
                 $ZUUL_CLONER --cache-dir \
                     /opt/git \
                     https://opendev.org \
                     openstack/tripleo-quickstart-extras
-                cd openstack/tripleo-quickstart-extras
+                pushd openstack/tripleo-quickstart-extras
                 if [ $OPT_CLEAN == 1 ]; then
                     $(python_cmd) -m pip install --no-cache-dir --force-reinstall .
                 else
                     $(python_cmd) -m pip install --force-reinstall .
                 fi
-        exit
+                popd
             popd
         fi
     popd
@@ -516,6 +530,7 @@ activate_venv
 
 export ANSIBLE_CONFIG=$OOOQ_DIR/ansible.cfg
 export ANSIBLE_INVENTORY=$OPT_WORKDIR/hosts
+export ANSIBLE_COLLECTIONS_PATH="$OPT_WORKDIR/share/ansible/collections:~/.ansible/collections:/usr/share/ansible/collections"
 export ARA_DATABASE="sqlite:///${OPT_WORKDIR}/ara.sqlite"
 
 #set the ansible ssh.config options if not already set.