openstack
/
tripleo-quickstart
Code Issues Proposed changes

fix openstack collections in tq 

tripleo-operators and tripleo-ansible
are both in quickstart-extras-requirements
By default both should be pip installed via
http locally and via file:/// in ci
see: https://rb.gy/qcy8mi

The collections wind up in
share/ansible/collections/ansible_collections
either way.

This may impact centos-ci, still checking

Change-Id: Ibdb1b394887a6dcb7e2285ba93ceda43e701b8de
This commit is contained in:
Wes Hayutin 2020-08-07 08:27:44 -06:00 committed by yatin
parent 27d460b0b8
commit b38eba1b09
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible.cfg
View File

@ -17,6 +17,7 @@ callback_plugins = /usr/lib/python2.7/site-packages/ara/plugins/callbacks:$VIRTU
test_plugins = /usr/lib/python2.7/site-packages/tripleo-quickstart/test_plugins:$VIRTUAL_ENV/usr/local/share/tripleo-quickstart/test_plugins:test_plugins
library = /usr/lib/python2.7/site-packages/tripleo-quickstart/library:$VIRTUAL_ENV/usr/local/share/tripleo-quickstart/library:library:$VIRTUAL_ENV/share/ansible/plugins/modules
roles_path = roles:$VIRTUAL_ENV/usr/local/share/tripleo-quickstart/roles:$VIRTUAL_ENV/usr/local/share/ansible/roles:$VIRTUAL_ENV/usr/local/share/opstools-ansible/roles:$VIRTUAL_ENV/share/ansible/roles:$VIRTUAL_ENV/usr/share/ansible/roles
collections_paths = collections:$VIRTUAL_ENV/share/ansible/collections:$VIRTUAL_ENV/share/ansible/collections/ansible_collections
action_plugins = /usr/share/ansible/plugins/action:$VIRTUAL_ENV/share/ansible/plugins/action:$VIRTUAL_ENV/lib/python2.7/site-packages/ara/plugins/actions:$VIRTUAL_ENV/lib/python3.6/site-packages/ara/plugins/actions
[ssh_connection]

29
quickstart.sh
View File

@ -142,33 +142,6 @@ bootstrap () {
$(python_cmd) -m pip install --force-reinstall "${OPT_REQARGS[@]}"
fi
if [ -x "$ZUUL_CLONER" ] && [ ! -z "$ZUUL_BRANCH" ]; then
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 ansible-collections-openstack from source
$ZUUL_CLONER --cache-dir \
/opt/git \
https://opendev.org \
openstack/ansible-collections-openstack
pushd openstack/ansible-collections-openstack
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 \
@ -181,10 +154,8 @@ bootstrap () {
$(python_cmd) -m pip install --force-reinstall .
fi
popd
popd
fi
popd
}
activate_venv() {