From 93831a60915d899e00c0eaa00a1e8b5511de3e88 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Mon, 12 Nov 2018 16:29:12 -0600 Subject: [PATCH] Move ARA install to end of bootstrap 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 --- scripts/bootstrap-ansible.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 27d2ca5aac..fe48b17da2 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -182,11 +182,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" @@ -232,4 +227,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."