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