diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-21 09:39:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-21 09:39:56 +0000 |
| commit | 3f883df4acbd53f04f15229886d2287f28573123 (patch) | |
| tree | 933feef17e58626fd9950fb03ec770eacc92948f | |
| parent | 6f17e3ffc1c197441c92b5fd5c6ef6f5662d86a6 (diff) | |
| parent | 91f0ff1c91357ce57ecc23cac371bdcad4aa3725 (diff) | |
| download | kolla-3f883df4acbd53f04f15229886d2287f28573123.tar.gz kolla-3f883df4acbd53f04f15229886d2287f28573123.zip | |
Merge "Run init-once in kolla-ansible folder"
| -rwxr-xr-x | tools/deploy_aio.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh index d5c10db5f..7197a4292 100755 --- a/tools/deploy_aio.sh +++ b/tools/deploy_aio.sh @@ -8,9 +8,9 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" export KOLLA_BASE=$1 export KOLLA_TYPE=$2 export KEEPALIVED_VIRTUAL_ROUTER_ID=$(shuf -i 1-255 -n 1) +export KOLLA_ANSIBLE_DIR=$(mktemp -d) function prepare_kolla_ansible { - KOLLA_ANSIBLE_DIR=$(mktemp -d) cat > /tmp/clonemap <<EOF clonemap: - name: openstack/kolla-ansible @@ -49,7 +49,7 @@ function sanity_check { docker restart memcached nova --debug service-list neutron --debug agent-list - tools/init-runonce + ${KOLLA_ANSIBLE_DIR}/tools/init-runonce nova --debug boot --poll --image $(openstack image list | awk '/cirros/ {print $2}') --nic net-id=$(openstack network list | awk '/demo-net/ {print $2}') --flavor 1 kolla_boot_test nova --debug list # If the status is not ACTIVE, print info and exit 1 |