diff --git a/.zuul.d/playbooks-deploy/run.yml b/.zuul.d/playbooks-deploy/run.yml index 53d9432..d01de1a 100644 --- a/.zuul.d/playbooks-deploy/run.yml +++ b/.zuul.d/playbooks-deploy/run.yml @@ -6,6 +6,7 @@ environment: SSH_AUTH_SOCK: "{{ ssh_agent_sock }}" ANSIBLE_VAULT_PASSWORD_FILE: "{{ vault_key_path }}" + INSTALL_ARA: true tasks: - name: Run the deploy job command: scripts/run_deploy.sh diff --git a/scripts/run_deploy.sh b/scripts/run_deploy.sh index 56cce53..43a6a05 100755 --- a/scripts/run_deploy.sh +++ b/scripts/run_deploy.sh @@ -4,10 +4,14 @@ set -e export SCRIPT_PATH=$(dirname $(readlink -f "$0")) export PROJECT_PATH=$(dirname "$SCRIPT_PATH") +export INSTALL_ARA="${INSTALL_ARA:-false}" cp -R ${PROJECT_PATH}/openstack_deploy /etc pushd ${PROJECT_PATH}/openstack-ansible -scripts/bootstrap-ansible.sh +source scripts/bootstrap-ansible.sh +if [ "$INSTALL_ARA" == true ]; then + setup_ara +fi popd pushd ${PROJECT_PATH}/openstack-ansible/playbooks