From 5344f28cc40925f5e2cef30cc84bb3d804167a7d Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Sun, 17 Mar 2019 16:57:24 -0500
Subject: [PATCH] Fix ARA setup

Change-Id: If22b06353eeb23570fbcd13cd4493e8d67b9ce5f
---
 scripts/run_deploy.sh           | 3 ---
 zuul.d/jobs.yaml                | 2 +-
 zuul.d/playbooks-deploy/run.yml | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/run_deploy.sh b/scripts/run_deploy.sh
index cb41da6..df32736 100755
--- a/scripts/run_deploy.sh
+++ b/scripts/run_deploy.sh
@@ -9,9 +9,6 @@ export SETUP_ARA="${SETUP_ARA:-false}"
 cp -RL ${PROJECT_PATH}/openstack_deploy /etc
 pushd ${PROJECT_PATH}/openstack-ansible
 source scripts/bootstrap-ansible.sh
-if [ "$SETUP_ARA" == true ]; then
-    setup_ara
-fi
 popd
 
 pushd ${PROJECT_PATH}/openstack-ansible/playbooks
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 48db76e..28b99b6 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -2,7 +2,7 @@
 
 - job:
     name: limestone-ci-deploy
-    description: |
+    description: >-
       Run openstack-ansible to deploy the Limestone Networks
       CI cloud
     pre-run: zuul.d/playbooks-deploy/pre.yml
diff --git a/zuul.d/playbooks-deploy/run.yml b/zuul.d/playbooks-deploy/run.yml
index dbc305e..9923f86 100644
--- a/zuul.d/playbooks-deploy/run.yml
+++ b/zuul.d/playbooks-deploy/run.yml
@@ -6,7 +6,7 @@
   environment:
     SSH_AUTH_SOCK: "{{ ssh_agent_sock }}"
     ANSIBLE_VAULT_PASSWORD_FILE: "{{ vault_key_path }}"
-    SETUP_ARA: true
+    SETUP_ARA: 'true'
   tasks:
     - name: Run the deploy job
       command: scripts/run_deploy.sh