From 55c468c422ae7bc48f46847d6fa21e53d4673259 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Thu, 23 Jan 2014 15:01:50 +0400
Subject: [PATCH] Use DATABASE/connection opt for db url in Savanna

DATABASE/sql_connection opt is now deprecated.

Change-Id: I58058f0d51e16de53e6472c8c01065438d709edc
---
 lib/savanna | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/savanna b/lib/savanna
index bb4dfe693d..57d8ac39ce 100644
--- a/lib/savanna
+++ b/lib/savanna
@@ -96,8 +96,7 @@ function configure_savanna() {
     iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT debug $SAVANNA_DEBUG
 
     recreate_database savanna utf8
-    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE database sql_connection `database_connection_url savanna`
-    inicomment $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE database connection
+    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE database connection `database_connection_url savanna`
 
     if is_service_enabled neutron; then
         iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT use_neutron true