commit 55c468c422ae7bc48f46847d6fa21e53d4673259
author Sergey Lukjanov <slukjanov@mirantis.com> Thu Jan 23 15:01:50 2014 +0400
committer Sergey Lukjanov <slukjanov@mirantis.com> Thu Jan 23 15:04:29 2014 +0400
tree 85e12b653fde02fb8fb56e736df6c962526a8822
parent 6d323f43b499482765438a964ac11874d4af3aec

Use DATABASE/connection opt for db url in Savanna

DATABASE/sql_connection opt is now deprecated.

Change-Id: I58058f0d51e16de53e6472c8c01065438d709edc

lib/savanna

diff --git a/lib/savanna b/lib/savanna
index bb4dfe6..57d8ac3 100644
--- a/lib/savanna
+++ b/lib/savanna
@@ -96,8 +96,7 @@
     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