openstack/openstack-ansible
Code Issues Proposed changes

Merge "Change the order of params for openstack-ansible"

Browse Source
This commit is contained in:
Zuul 2019-09-13 16:11:41 +00:00 committed by Gerrit Code Review
commit 6967138311
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/extra_variables_precedence-001b0b355ada6d39.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Passed --extra-vars flag to the openstack-ansible should have precedence
over the user-variables*.yml now.

4
scripts/openstack-ansible.sh
View File

@ -77,7 +77,7 @@ fi
# Execute the Ansible command.
if [ "${RUN_CMD}" == "openstack-ansible" ] || [ "${RUN_CMD}" == "ansible-playbook" ]; then
ansible-playbook "${@}" ${VAR1}
ansible-playbook ${VAR1} "${@}"
PLAYBOOK_RC="$?"
if [[ "${PLAYBOOK_RC}" -ne "0" ]]; then
echo -e "\nEXIT NOTICE [Playbook execution failure] **************************************"
@ -87,5 +87,5 @@ if [ "${RUN_CMD}" == "openstack-ansible" ] || [ "${RUN_CMD}" == "ansible-playboo
echo "==============================================================================="
exit "${PLAYBOOK_RC}"
else
${RUN_CMD} "${@}" ${VAR1}
${RUN_CMD} ${VAR1} "${@}"
fi