Fix Nova upgrade jobs

The Nova upgrades need to inherit the "os_nova-overrides.yml" vars file,
otherwise the incorrect tempest tests will run and tests for endpoints
that don't exist will fail.

Change-Id: Icc70108c0576a3844fbe09374def0c629398913f
This commit is contained in:
Andy McCrae 2017-03-21 14:11:49 +00:00
parent 335eb7912a
commit 3df65a5549

View File

@ -37,6 +37,7 @@ export WORKING_DIR=${WORKING_DIR:-$(pwd)}
export ROLE_NAME=${ROLE_NAME:-''}
export ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-"-vvv"}
export ANSIBLE_OVERRIDES=${ANSIBLE_OVERRIDES:-$WORKING_DIR/tests/os_nova-overrides.yml}
export TEST_PLAYBOOK=${TEST_PLAYBOOK:-$WORKING_DIR/tests/test-upgrade.yml}
export TEST_CHECK_MODE=${TEST_CHECK_MODE:-false}
export TEST_IDEMPOTENCE=${TEST_IDEMPOTENCE:-false}
@ -53,7 +54,7 @@ echo "TEST_IDEMPOTENCE: ${TEST_IDEMPOTENCE}"
function execute_ansible_playbook {
export ANSIBLE_CLI_PARAMETERS="${ANSIBLE_PARAMETERS}"
export ANSIBLE_CLI_PARAMETERS="${ANSIBLE_PARAMETERS} -e @${ANSIBLE_OVERRIDES}"
CMD_TO_EXECUTE="ansible-playbook ${TEST_PLAYBOOK} $@ ${ANSIBLE_CLI_PARAMETERS}"
echo "Executing: ${CMD_TO_EXECUTE}"