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