From fe42255bfac23a74890c2c7d8cfef385428cef32 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Thu, 23 Jan 2014 14:18:54 +0400
Subject: [PATCH] Use savanna-db-manage to init db for Savanna

It uses alembic migrations to initialize database.

Change-Id: I6cf01f69c6bc7c9e403040607dd397cfc3b574a4
---
 lib/savanna | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/savanna b/lib/savanna
index 57d8ac39ce..c7d59f79c4 100644
--- a/lib/savanna
+++ b/lib/savanna
@@ -95,7 +95,6 @@ function configure_savanna() {
     iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME
     iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT debug $SAVANNA_DEBUG
 
-    recreate_database savanna utf8
     iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE database connection `database_connection_url savanna`
 
     if is_service_enabled neutron; then
@@ -104,6 +103,9 @@ function configure_savanna() {
     fi
 
     iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT use_syslog $SYSLOG
+
+    recreate_database savanna utf8
+    $SAVANNA_BIN_DIR/savanna-db-manage --config-file $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE upgrade head
 }
 
 # install_savanna() - Collect source and prepare