openstack/openstack-ansible
Code Issues Proposed changes

Change the order of params for openstack-ansible

Browse Source 
In order to allow deployers to override variable from user_variables.yml
for the specific run of openstack-ansible with --extra-vars flag
we're changing the order of passed arguments to the ansible-playbook.

Change-Id: I1ad7d35241eef80ee5e46583b9625cb2694fc063
This commit is contained in:
Dmitriy Rabotyagov 2019-09-12 19:08:45 +03:00
parent ea73ecf1e6
commit 0f8a14baf9
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. # Execute the Ansible command.
if [ "${RUN_CMD}" == "openstack-ansible" ] || [ "${RUN_CMD}" == "ansible-playbook" ]; then if [ "${RUN_CMD}" == "openstack-ansible" ] || [ "${RUN_CMD}" == "ansible-playbook" ]; then
ansible-playbook "${@}" ${VAR1} ansible-playbook ${VAR1} "${@}"
PLAYBOOK_RC="$?" PLAYBOOK_RC="$?"
if [[ "${PLAYBOOK_RC}" -ne "0" ]]; then if [[ "${PLAYBOOK_RC}" -ne "0" ]]; then
echo -e "\nEXIT NOTICE [Playbook execution failure] **************************************" echo -e "\nEXIT NOTICE [Playbook execution failure] **************************************"
@ -87,5 +87,5 @@ if [ "${RUN_CMD}" == "openstack-ansible" ] || [ "${RUN_CMD}" == "ansible-playboo
echo "===============================================================================" echo "==============================================================================="
exit "${PLAYBOOK_RC}" exit "${PLAYBOOK_RC}"
else else
${RUN_CMD} "${@}" ${VAR1} ${RUN_CMD} ${VAR1} "${@}"
fi fi