openstack
/
tripleo-quickstart
Code Issues Proposed changes

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
This commit is contained in:
Alex Schultz 2020-01-02 16:45:21 -07:00
parent 7d15b247f8
commit cad7cb522e
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quickstart-extras-requirements.txt
View File

@ -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

21
quickstart.sh
View File

@ -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-quickstart-extras
cd openstack/tripleo-quickstart-extras
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
exit
popd
# pull in tripleo-quickstart-extras from source
$ZUUL_CLONER --cache-dir \
/opt/git \
https://opendev.org \
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
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.