commit 307cfcb9d11945b5f89f249d8779e51c87f1bc34
author Jenkins <jenkins@review.openstack.org> Thu Jul 31 11:05:07 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jul 31 11:05:07 2014 +0000
tree 548eb101e449d8154869b1068050bbff58cbce3b
parent 94143349723860105ef4fd1e3bbdda9a0ef96726
parent b816e5d2a079a52c92482a138583376617bded47

Merge "neutron: set connection string in neutron.conf"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index ff4b3c4..2763f26 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -625,7 +625,7 @@
     Q_PLUGIN_CONF_FILE=$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
     cp $NEUTRON_DIR/$Q_PLUGIN_CONF_FILE /$Q_PLUGIN_CONF_FILE
 
-    iniset /$Q_PLUGIN_CONF_FILE database connection `database_connection_url $Q_DB_NAME`
+    iniset $NEUTRON_CONF database connection `database_connection_url $Q_DB_NAME`
     iniset $NEUTRON_CONF DEFAULT state_path $DATA_DIR/neutron
 
     # If addition config files are set, make sure their path name is set as well