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/nova-controller | |
| 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/nova-controller')
| -rwxr-xr-x | docker/nova-controller/nova-api/start.sh | 4 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-conductor/start.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-scheduler/start.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh index 723a3539e..90cc62976 100755 --- a/docker/nova-controller/nova-api/start.sh +++ b/docker/nova-controller/nova-api/start.sh @@ -8,8 +8,8 @@ check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \ ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \ NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME -check_for_keystone -check_for_db $NOVA_DB_NAME +fail_unless_os_service_running keystone +fail_unless_db $NOVA_DB_NAME export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh index 831c80e80..599fb0246 100755 --- a/docker/nova-controller/nova-conductor/start.sh +++ b/docker/nova-controller/nova-conductor/start.sh @@ -5,7 +5,7 @@ set -e . /opt/kolla/config-nova.sh check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD -check_for_db +fail_unless_db mysql -h ${MARIADB_SERVICE_HOST} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh index da7f5f32a..087d477fe 100755 --- a/docker/nova-controller/nova-scheduler/start.sh +++ b/docker/nova-controller/nova-scheduler/start.sh @@ -5,6 +5,6 @@ set -e . /opt/kolla/config-nova.sh check_required_vars NOVA_DB_NAME -check_for_db $NOVA_DB_NAME +fail_unless_db $NOVA_DB_NAME exec /usr/bin/nova-scheduler |