From f4b7ae95ac24f395e8d7ddd36cba362659fd29b4 Mon Sep 17 00:00:00 2001 From: Martin André Date: Mon, 19 Jan 2015 15:06:28 +0900 Subject: Check for nova DB availability in dependent containers When nova-api start and the nova database hasn't yet been created, it would create it itself, preventing the migration in nova-conductor to run and making it unable to start. This commit ensures that nova-api container will not try to steal nova-conductor's job of creating the nova database. Nova-scheduler reacts differently to the missing database and simply exits with a backtrace. This commit also prevents nova-scheduler to start when the nova database cannot be found. Change-Id: Ib6f7521151815faa7a26ec1d170df5a1cdb7fd63 Related-Bug: #1335804 --- docker/nova-controller/nova-api/start.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/nova-controller/nova-api/start.sh') 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" -- cgit v1.2.3