Browse code

Merge "Use DATABASE/connection opt for db url in Savanna"

Jenkins authored on 2014/01/25 13:14:58
Showing 1 changed files
... ...
@@ -96,8 +96,7 @@ function configure_savanna() {
96 96
     iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT debug $SAVANNA_DEBUG
97 97
 
98 98
     recreate_database savanna utf8
99
-    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE database sql_connection `database_connection_url savanna`
100
-    inicomment $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE database connection
99
+    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE database connection `database_connection_url savanna`
101 100
 
102 101
     if is_service_enabled neutron; then
103 102
         iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT use_neutron true