aboutsummaryrefslogtreecommitdiff
path: root/tools/deploy_aio.sh
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-19 16:01:23 +0000
committerGerrit Code Review <review@openstack.org>2017-10-19 16:01:23 +0000
commit323ee0b09ce6e74c2e45e9baff9983e7e9cea90e (patch)
treef092d2f2fe026c693841784cdd449db7064c0385 /tools/deploy_aio.sh
parent5767a494def9c4e454b28c2c689c21639f348e56 (diff)
parentb64198cce099934a9389a34522c73e2bb65e399d (diff)
downloadkolla-323ee0b09ce6e74c2e45e9baff9983e7e9cea90e.tar.gz
kolla-323ee0b09ce6e74c2e45e9baff9983e7e9cea90e.zip
Merge "Moving jobs to kolla repo"
Diffstat (limited to 'tools/deploy_aio.sh')
-rwxr-xr-xtools/deploy_aio.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index 56134eb8c..aee1118a2 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -22,16 +22,16 @@ EOF
pushd "${KOLLA_ANSIBLE_DIR}"
function get_logs {
- sudo ansible-playbook -i ${RAW_INVENTORY} --become ${KOLLA_ANSIBLE_DIR}/tests/ansible_get_logs.yml > /tmp/logs/ansible/get-logs
+ sudo ansible-playbook -i ${INVENTORY} --become ${KOLLA_ANSIBLE_DIR}/tests/ansible_get_logs.yml > /tmp/logs/ansible/get-logs
}
# Copy configs
sudo cp -a etc/kolla /etc/
# Generate passwords
-export RAW_INVENTORY=/tmp/kolla/raw_inventory
+export INVENTORY=/tmp/kolla/inventory
-sudo ansible-playbook -i ${RAW_INVENTORY} --become tests/ansible_generate_inventory.yml
-sudo ansible-playbook -i ${RAW_INVENTORY} --become -e action="deploy" -e type=$KOLLA_TYPE -e base=$KOLLA_BASE tests/ansible_generate_config.yml > /tmp/logs/ansible/generate_config
+sudo ansible-playbook -i ${INVENTORY} --become tests/ansible_generate_inventory.yml
+sudo ansible-playbook -i ${INVENTORY} --become -e action="deploy" -e type=$KOLLA_TYPE -e base=$KOLLA_BASE tests/ansible_generate_config.yml > /tmp/logs/ansible/generate_config
trap get_logs EXIT
@@ -39,9 +39,9 @@ sudo ip l a fake_interface type dummy
sudo tools/generate_passwords.py
sudo chmod -R 777 /etc/kolla
-sudo tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks > /tmp/logs/ansible/prechecks
-sudo tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy > /tmp/logs/ansible/deploy
-sudo tools/kolla-ansible -i ${RAW_INVENTORY} -vvv post-deploy > /tmp/logs/ansible/post-deploy
+sudo tools/kolla-ansible -i ${INVENTORY} -vvv prechecks > /tmp/logs/ansible/prechecks
+sudo tools/kolla-ansible -i ${INVENTORY} -vvv deploy > /tmp/logs/ansible/deploy
+sudo tools/kolla-ansible -i ${INVENTORY} -vvv post-deploy > /tmp/logs/ansible/post-deploy
get_logs