openstack/openstack-ansible
Code Issues Proposed changes

Merge "Fix infra upgrade"

Browse Source
This commit is contained in:
Zuul 2022-01-28 14:38:37 +00:00 committed by Gerrit Code Review
commit 5c22ce22a3
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/gate-check-commit.sh
View File

@ -262,6 +262,10 @@ if [[ "${ACTION}" == "upgrade" ]]; then
echo 'YES' | bash "${OSA_CLONE_DIR}/scripts/run-upgrade.sh" echo 'YES' | bash "${OSA_CLONE_DIR}/scripts/run-upgrade.sh"
if [[ $SCENARIO =~ "infra" ]]; then if [[ $SCENARIO =~ "infra" ]]; then
# TODO(noonedeadpunk): Remove after Y release
set -a
. ${OSA_CLONE_DIR}/scripts/upgrade-utilities/unset-ansible-env.rc
set +a
# Verify our infra setup after upgrade # Verify our infra setup after upgrade
openstack-ansible ${OSA_CLONE_DIR}/playbooks/healthcheck-infrastructure.yml -e osa_gather_facts=False openstack-ansible ${OSA_CLONE_DIR}/playbooks/healthcheck-infrastructure.yml -e osa_gather_facts=False
fi fi

8
scripts/run-upgrade.sh
View File

@ -166,13 +166,7 @@ function main {
unset ANSIBLE_INVENTORY unset ANSIBLE_INVENTORY
# TODO(noonedeadpunk): Remove after Y release # TODO(noonedeadpunk): Remove after Y release
unset ANSIBLE_LIBRARY source ${SCRIPTS_PATH}/upgrade-utilities/unset-ansible-env.rc
unset ANSIBLE_FILTER_PLUGINS
unset ANSIBLE_ACTION_PLUGINS
unset ANSIBLE_CALLBACK_PLUGINS
unset ANSIBLE_TRANSPORT
unset ANSIBLE_STRATEGY_PLUGINS
unset ANSIBLE_CONNECTION_PLUGINS
bootstrap_ansible bootstrap_ansible

7
scripts/upgrade-utilities/unset-ansible-env.rc Normal file
View File

@ -0,0 +1,7 @@
unset ANSIBLE_LIBRARY
unset ANSIBLE_FILTER_PLUGINS
unset ANSIBLE_ACTION_PLUGINS
unset ANSIBLE_CALLBACK_PLUGINS
unset ANSIBLE_TRANSPORT
unset ANSIBLE_STRATEGY_PLUGINS
unset ANSIBLE_CONNECTION_PLUGINS