[openstack-quantum] fix helper scripts to setup the database config correctly (#847785)

[Pádraig Brady]

commit 9a47f3a7810189f7ceafd0915a326d6bb51a57d5
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Aug 23 00:09:56 2012 +0100

    fix helper scripts to setup the database config correctly (#847785)
    
    The existing setup was for when quantum was hardcoded to use MySQL,
    whereas the new config is required since the switch to SQLAlchemy.

 openstack-quantum.spec |    5 ++++-
 quantum-node-setup     |    5 +----
 quantum-server-setup   |    5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 1253648..438c1a6 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -4,7 +4,7 @@
 
 Name:		openstack-quantum
 Version:	2012.2
-Release:	0.2.f2%{?dist}
+Release:	0.3.f2%{?dist}
 Summary:	Virtual network service for OpenStack (quantum)
 
 Group:		Applications/System
@@ -401,6 +401,9 @@ fi
 
 
 %changelog
+* Wed Aug 22 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.3.f2
+- Fix helper scripts to setup the database config correctly (#847785)
+
 * Tue Aug  7 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.2.f2
 - Include quantum module no longer provided by python-quantumclient
 - Update description text
diff --git a/quantum-node-setup b/quantum-node-setup
index 3184914..e0389cc 100644
--- a/quantum-node-setup
+++ b/quantum-node-setup
@@ -145,10 +145,7 @@ case "${QUANTUM_PLUGIN}" in
 ;;
 
 "linuxbridge")
-	openstack-config --set ${LB_CONF} DATABASE connection mysql
-        openstack-config --set ${LB_CONF} DATABASE user ${QUANTUM_USER}
-        openstack-config --set ${LB_CONF} DATABASE pass ${MYSQL_Q_PW}
-	openstack-config --set ${LB_CONF} DATABASE host ${QUANTUM_HOST}
+	openstack-config --set ${LB_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@${QUANTUM_HOST}/quantum_linux_bridge
         LIBVIRT_VIF_TYPE=ethernet
         LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
         LINUX_INTERFACE_DRIVER=nova.network.linux_net.QuantumLinuxBridgeInterfaceDriver
diff --git a/quantum-server-setup b/quantum-server-setup
index 0e78062..1a02a8f 100644
--- a/quantum-server-setup
+++ b/quantum-server-setup
@@ -323,10 +323,7 @@ case "${QUANTUM_PLUGIN}" in
 "linuxbridge")
 	mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on quantum_linux_bridge.* to '${QUANTUM_USER}'@'%'"
 	mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on quantum_linux_bridge.* to '${QUANTUM_USER}'@'localhost'"
-        openstack-config --set ${LB_CONF} DATABASE connection mysql
-        openstack-config --set ${LB_CONF} DATABASE user ${QUANTUM_USER}
-        openstack-config --set ${LB_CONF} DATABASE pass ${MYSQL_Q_PW}
-        openstack-config --set ${LB_CONF} DATABASE host `hostname`
+	openstack-config --set ${LB_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/quantum_linux_bridge
 	
 	echo "Please enter network device for VLAN trunking:"
 	read NETWORK_DEVICE