summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2016-11-17 01:31:04 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2016-11-18 11:03:42 +0800
commitefa26ed7415576c5e1a3215dfafda78e2fb1b2ff (patch)
tree089b94770728b65a93b04b9f2b3c01ccea521384
parent1ecb1fc4e7a4ce6b34205dc89fb6a5aa08a3c6e4 (diff)
downloadkolla-efa26ed7415576c5e1a3215dfafda78e2fb1b2ff.tar.gz
kolla-efa26ed7415576c5e1a3215dfafda78e2fb1b2ff.zip
Use kolla-ansible for deployment
Change-Id: I2eb821f88d47b665615ad56319dd40681f7d9967
-rwxr-xr-xtools/deploy_aio.sh25
1 files changed, 20 insertions, 5 deletions
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index d536171a9..d5c10db5f 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -9,6 +9,19 @@ export KOLLA_BASE=$1
export KOLLA_TYPE=$2
export KEEPALIVED_VIRTUAL_ROUTER_ID=$(shuf -i 1-255 -n 1)
+function prepare_kolla_ansible {
+ KOLLA_ANSIBLE_DIR=$(mktemp -d)
+ cat > /tmp/clonemap <<EOF
+clonemap:
+ - name: openstack/kolla-ansible
+ dest: ${KOLLA_ANSIBLE_DIR}
+EOF
+ /usr/zuul-env/bin/zuul-cloner -m /tmp/clonemap --workspace "$(pwd)" \
+ --cache-dir /opt/git git://git.openstack.org \
+ openstack/kolla-ansible
+ pip install ${KOLLA_ANSIBLE_DIR}
+}
+
function copy_logs {
cp -rnL /var/lib/docker/volumes/kolla_logs/_data/* /tmp/logs/kolla/
cp -rnL /etc/kolla/* /tmp/logs/kolla_configs/
@@ -74,6 +87,7 @@ docker_restart_policy: "never"
docker_namespace: "lokolla"
network_interface: "${PRIVATE_INTERFACE}"
neutron_external_interface: "fake_interface"
+openstack_release: "4.0.0"
enable_horizon: "no"
enable_heat: "no"
openstack_logging_debug: "True"
@@ -89,23 +103,24 @@ EOF
trap check_failure EXIT
+prepare_kolla_ansible
write_configs
# Create dummy interface for neutron
ip l a fake_interface type dummy
# Actually do the deployment
-tools/kolla-ansible -vvv prechecks
+kolla-ansible -vvv prechecks
# TODO(jeffrey4l): add pull action when we have a local registry
# service in CI
-tools/kolla-ansible -vvv deploy
-tools/kolla-ansible -vvv post-deploy
+kolla-ansible -vvv deploy
+kolla-ansible -vvv post-deploy
# Test OpenStack Environment
sanity_check
# TODO(jeffrey4l): make some configure file change and
# trigger a real reconfigure
-tools/kolla-ansible -vvv reconfigure
+kolla-ansible -vvv reconfigure
# TODO(jeffrey4l): need run a real upgrade
-tools/kolla-ansible -vvv upgrade
+kolla-ansible -vvv upgrade