commit 7c7dedb2e2626d83999f1ebec53d3b4e64dcfdb5
author Jenkins <jenkins@review.openstack.org> Thu Mar 15 22:45:16 2012 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 15 22:45:16 2012 +0000
tree 7baa2d0633a2195a9d71c241f6d127afb06fe1cd
parent d2ace9361803b52e0ee214ec22c96e0f87d5d72c
parent c9e0188e929a44e8a2ce957885ed755f2096058e

Merge "Only do a nova-manage db_sync when we have nova."

stack.sh

diff --git a/stack.sh b/stack.sh
index 886e839..218e83f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1366,7 +1366,7 @@
 # All nova components talk to a central database.  We will need to do this step
 # only once for an entire cluster.
 
-if is_service_enabled mysql; then
+if is_service_enabled mysql && is_service_enabled nova; then
     # (re)create nova database
     mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS nova;'
     mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE nova;'