From 4070a4acf4ea83f2723f8e4e976d5026d4de4a4d Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Thu, 13 Sep 2018 15:47:35 -0600
Subject: [PATCH] Install and run ARA in OSA venv

Change-Id: I924faad14a3209631fb3b2b09f4820bc1ec6bac9
---
 .zuul.d/playbooks-deploy/run.yml | 1 +
 scripts/run_deploy.sh            | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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