diff options
| author | Martin André <martin.andre@kvhasia.com> | 2015-03-30 10:14:03 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2015-04-01 16:39:44 +0900 |
| commit | 34872c1c2f68f4a410c423ed8b615822a29ff94a (patch) | |
| tree | d68f9b10e68580956a2a3d20f28d8923f255aa25 /docker/cinder | |
| parent | cf3086ed3bca797ecc34e9c401951d1d64fe326a (diff) | |
| download | kolla-34872c1c2f68f4a410c423ed8b615822a29ff94a.tar.gz kolla-34872c1c2f68f4a410c423ed8b615822a29ff94a.zip | |
Allow check_for_* functions to be consumed by wait_for
In order for the `check_for_*` functions to be consumed by `wait_for`,
they should notify of their success but not exit.
As a consequence, the previous behavior is restored by the fail_unless_*
companion functions.
With this change, it is now possible to do:
wait_for 30 1 check_for_os_service_running keystone
Change-Id: I16ddf8913027030c3ccb5487713d172904508fd6
Diffstat (limited to 'docker/cinder')
| -rwxr-xr-x | docker/cinder/start.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/docker/cinder/start.sh b/docker/cinder/start.sh index 4508d96f4..c0d796f02 100755 --- a/docker/cinder/start.sh +++ b/docker/cinder/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash -e : ${CINDER_DB_USER:=cinder} : ${CINDER_DB_NAME:=cinder} @@ -13,49 +13,49 @@ fi check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ CINDER_ADMIN_PASSWORD -check_for_db +fail_unless_db mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <<EOF -CREATE DATABASE IF NOT EXISTS ${CINDER_DB_NAME}; -GRANT ALL PRIVILEGES ON glance* TO - '${CINDER_DB_USER}'@'%' IDENTIFIED BY '${CINDER_DB_PASSWORD}' +CREATE DATABASE IF NOT EXISTS ${CINDER_DB_NAME}; +GRANT ALL PRIVILEGES ON glance* TO + '${CINDER_DB_USER}'@'%' IDENTIFIED BY '${CINDER_DB_PASSWORD}' EOF #-----Cinder.conf setup----- # Cinder database -crudini --set /etc/cinder/cinder.conf \ +crudini --set /etc/cinder/cinder.conf \ DEFAULT \ db_driver \ "cinder.db" # Rabbit -crudini --set /etc/cinder/cinder.conf \ +crudini --set /etc/cinder/cinder.conf \ DEFAULT \ rabbit_host \ "127.0.0.1" -crudini --set /etc/cinder/cinder.conf \ +crudini --set /etc/cinder/cinder.conf \ DEFAULT \ rabbit_port \ "5672" -crudini --set /etc/cinder/cinder.conf \ +crudini --set /etc/cinder/cinder.conf \ DEFAULT \ rabbit_hosts \ "127.0.0.1:5672" -crudini --set /etc/cinder/cinder.conf \ +crudini --set /etc/cinder/cinder.conf \ DEFAULT \ rabbit_userid \ "guest" -crudini --set /etc/cinder/cinder.conf \ +crudini --set /etc/cinder/cinder.conf \ DEFAULT \ rabbit_password \ "guest" -crudini --set /etc/cinder/cinder.conf \ +crudini --set /etc/cinder/cinder.conf \ DEFAULT \ rabbit_virtual_host \ "/" -crudini --set /etc/cinder/cinder.conf \ - DEFAULT \ +crudini --set /etc/cinder/cinder.conf \ + DEFAULT \ rabbit_ha_queues \ "False" |
