diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-06 19:09:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-06 19:09:04 +0000 |
| commit | 4855d96c32086dff7fc3b0d249ea406f2f13f02a (patch) | |
| tree | d6e3ed24be9194405998fb07ee6cf01be92ce5c4 | |
| parent | 26b564dd06890862e268ea72b987bcb5ebf4bdb2 (diff) | |
| parent | f4b7ae95ac24f395e8d7ddd36cba362659fd29b4 (diff) | |
| download | kolla-4855d96c32086dff7fc3b0d249ea406f2f13f02a.tar.gz kolla-4855d96c32086dff7fc3b0d249ea406f2f13f02a.zip | |
Merge "Check for nova DB availability in dependent containers"
| -rw-r--r-- | docker/fedora-rdo-base/kolla-common.sh | 6 | ||||
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 1 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-api/start.sh | 3 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-scheduler/start.sh | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/docker/fedora-rdo-base/kolla-common.sh b/docker/fedora-rdo-base/kolla-common.sh index c9ba03be5..56c658c43 100644 --- a/docker/fedora-rdo-base/kolla-common.sh +++ b/docker/fedora-rdo-base/kolla-common.sh @@ -56,12 +56,14 @@ check_for_neutron() { } # Exit unless we receive a successful response from the database server. +# Optionally takes a database name to check for. Defaults to 'mysql'. check_for_db() { + local database=${1:-mysql} check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" \ - -e "select 1" mysql > /dev/null 2>&1 || { - echo "ERROR: database is not available @ $MARIADB_SERVICE_HOST" >&2 + -e "select 1" $database > /dev/null 2>&1 || { + echo "ERROR: database $database is not available @ $MARIADB_SERVICE_HOST" >&2 exit 1 } diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 10aa646fa..829fb48de 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -11,7 +11,6 @@ : ${RABBIT_PASSWORD:=guest} : ${NETWORK_MANAGER:=nova} -check_for_db check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \ RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \ KEYSTONE_PUBLIC_SERVICE_HOST PUBLIC_IP diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh index 49329f21c..723a3539e 100755 --- a/docker/nova-controller/nova-api/start.sh +++ b/docker/nova-controller/nova-api/start.sh @@ -7,8 +7,9 @@ set -e 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_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME check_for_keystone +check_for_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-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh index 71dd848f7..da7f5f32a 100755 --- a/docker/nova-controller/nova-scheduler/start.sh +++ b/docker/nova-controller/nova-scheduler/start.sh @@ -4,4 +4,7 @@ set -e . /opt/kolla/config-nova.sh +check_required_vars NOVA_DB_NAME +check_for_db $NOVA_DB_NAME + exec /usr/bin/nova-scheduler |