summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan V <logan2211@gmail.com>2019-03-17 16:57:24 -0500
committerLogan V <logan2211@gmail.com>2019-03-17 16:57:24 -0500
commit5344f28cc40925f5e2cef30cc84bb3d804167a7d (patch)
tree08e72322ee48a417107e1ed8ab51ce4a8fd9442a
parentde4f53847db6c2dbe6be59499d99107986e50c08 (diff)
Fix ARA setup
Notes
Notes (review): Code-Review+2: Logan V <logan2211@gmail.com> Workflow+1: Logan V <logan2211@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 17 Mar 2019 21:58:00 +0000 Reviewed-on: https://review.openstack.org/643768 Project: openstack/limestone-ci-cloud Branch: refs/heads/master
-rwxr-xr-xscripts/run_deploy.sh3
-rw-r--r--zuul.d/jobs.yaml2
-rw-r--r--zuul.d/playbooks-deploy/run.yml2
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}"
9cp -RL ${PROJECT_PATH}/openstack_deploy /etc 9cp -RL ${PROJECT_PATH}/openstack_deploy /etc
10pushd ${PROJECT_PATH}/openstack-ansible 10pushd ${PROJECT_PATH}/openstack-ansible
11source scripts/bootstrap-ansible.sh 11source scripts/bootstrap-ansible.sh
12if [ "$SETUP_ARA" == true ]; then
13 setup_ara
14fi
15popd 12popd
16 13
17pushd ${PROJECT_PATH}/openstack-ansible/playbooks 14pushd ${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 @@
2 2
3- job: 3- job:
4 name: limestone-ci-deploy 4 name: limestone-ci-deploy
5 description: | 5 description: >-
6 Run openstack-ansible to deploy the Limestone Networks 6 Run openstack-ansible to deploy the Limestone Networks
7 CI cloud 7 CI cloud
8 pre-run: zuul.d/playbooks-deploy/pre.yml 8 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 @@
6 environment: 6 environment:
7 SSH_AUTH_SOCK: "{{ ssh_agent_sock }}" 7 SSH_AUTH_SOCK: "{{ ssh_agent_sock }}"
8 ANSIBLE_VAULT_PASSWORD_FILE: "{{ vault_key_path }}" 8 ANSIBLE_VAULT_PASSWORD_FILE: "{{ vault_key_path }}"
9 SETUP_ARA: true 9 SETUP_ARA: 'true'
10 tasks: 10 tasks:
11 - name: Run the deploy job 11 - name: Run the deploy job
12 command: scripts/run_deploy.sh 12 command: scripts/run_deploy.sh