openstack/openstack-ansible
Code Issues Proposed changes

Move ARA install to end of bootstrap

Browse Source 
setup_ara sets up the callback plugins variable
so as it is now, it gets unset during the role
retrieval.  This commit moves it to the end of
bootstrap so that the ANSIBLE_CALLBACK_PLUGINS
is set.

Change-Id: I46ceb2acf377e38b2dc31ffc4a82b7945f8dd4c5
(cherry picked from commit 93831a6091)
This commit is contained in:
Antony Messerli 2018-11-12 16:29:12 -06:00 committed by Antony Messerli
parent 983a324a3b
commit ea1d05c8fb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/bootstrap-ansible.sh
View File

@ -290,11 +290,6 @@ chmod +x /usr/local/bin/openstack-ansible
echo "openstack-ansible wrapper created."
# Install and export the ARA callback plugin
if [ "${SETUP_ARA}" == "true" ]; then
setup_ara
fi
# If the Ansible plugins are in the old location remove them.
[[ -d "/etc/ansible/plugins" ]] && rm -rf "/etc/ansible/plugins"
@ -341,4 +336,9 @@ if [ -f "${ANSIBLE_ROLE_FILE}" ]; then
fi
fi
# Install and export the ARA callback plugin
if [ "${SETUP_ARA}" == "true" ]; then
setup_ara
fi
echo "System is bootstrapped and ready for use."