openstack/openstack-ansible
Code Issues Proposed changes

Move unsetting of group and host env vars

Browse Source 
The run-upgrade script sources 'scripts-library.sh' which sources
'openstack-ansible.rc'. The 'GROUP_VARS_PATH' and 'HOST_VARS_PATH'
environment variables will have to be unset after the new
'openstack-ansible.rc' file is written so that their changed values from
the previous release can take effect.

Change-Id: I39ce5c3cf69bcbecea8e940bea2f0a133cfac07a
This commit is contained in:
Jimmy McCrory 2017-06-15 14:35:35 -07:00
parent 1a6c2b583e
commit b9c839fdbb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,12 +183,6 @@ if [[ "${ACTION}" == "upgrade" ]]; then
unset ANSIBLE_PACKAGE unset ANSIBLE_PACKAGE
unset UPPER_CONSTRAINTS_FILE unset UPPER_CONSTRAINTS_FILE
# Unset environment variables used by the override_folder
# plugin to set paths for group and host vars since the
# default locations have changed between Ocata and Pike.
unset GROUP_VARS_PATH
unset HOST_VARS_PATH
# Kick off the data plane tester # Kick off the data plane tester
$(dirname "${0}")/../tests/data-plane-test.sh & $(dirname "${0}")/../tests/data-plane-test.sh &

6
scripts/run-upgrade.sh
View File

@ -164,6 +164,12 @@ function main {
"${SCRIPTS_PATH}/bootstrap-ansible.sh" "${SCRIPTS_PATH}/bootstrap-ansible.sh"
# Unset environment variables used by the override_folder
# plugin to set paths for group and host vars since the
# default locations have changed between Ocata and Pike.
unset GROUP_VARS_PATH
unset HOST_VARS_PATH
pushd ${MAIN_PATH}/playbooks pushd ${MAIN_PATH}/playbooks
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/ansible_fact_cleanup.yml") RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/ansible_fact_cleanup.yml")
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/deploy-config-changes.yml") RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/deploy-config-changes.yml")