summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan V <logan2211@gmail.com>2019-03-17 14:53:56 -0500
committerLogan V <logan2211@gmail.com>2019-03-17 14:54:57 -0500
commitb1f434c74730a2df273148d265348a764a02ffea (patch)
tree53dba0156d47321868de484d27bb9e5b5000cb30
parent5a0cd7db1da6af8cfc7837cd9914b04828083658 (diff)
Update ARA variable
In queens the ARA bootstrapping is controlled by SETUP_ARA, not INSTALL_ARA. Change-Id: Ic9f23ca01cabb3ed37ba51123ed040b0a34cec92
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 19:55:26 +0000 Reviewed-on: https://review.openstack.org/643759 Project: openstack/limestone-ci-cloud Branch: refs/heads/master
-rwxr-xr-xscripts/run_deploy.sh4
-rw-r--r--zuul.d/playbooks-deploy/run.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/run_deploy.sh b/scripts/run_deploy.sh
index 71e6ee2..a9ef774 100755
--- a/scripts/run_deploy.sh
+++ b/scripts/run_deploy.sh
@@ -4,12 +4,12 @@ set -e
4 4
5export SCRIPT_PATH=$(dirname $(readlink -f "$0")) 5export SCRIPT_PATH=$(dirname $(readlink -f "$0"))
6export PROJECT_PATH=$(dirname "$SCRIPT_PATH") 6export PROJECT_PATH=$(dirname "$SCRIPT_PATH")
7export INSTALL_ARA="${INSTALL_ARA:-false}" 7export SETUP_ARA="${SETUP_ARA:-false}"
8 8
9cp -R ${PROJECT_PATH}/openstack_deploy /etc 9cp -R ${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 [ "$INSTALL_ARA" == true ]; then 12if [ "$SETUP_ARA" == true ]; then
13 setup_ara 13 setup_ara
14fi 14fi
15popd 15popd
diff --git a/zuul.d/playbooks-deploy/run.yml b/zuul.d/playbooks-deploy/run.yml
index d01de1a..dbc305e 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 INSTALL_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