[openstack-quantum/f17] Update setup scripts for new DB configuration valiable

[Robert A. Kukura]

commit b18b2cf152ec2334b4effbd21adade688badeab2
Author: Bob Kukura <rkukura at redhat.com>
Date:   Sun Aug 12 15:21:23 2012 -0400

    Update setup scripts for new DB configuration valiable

 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 1868a84..e7ce121 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -4,7 +4,7 @@
 
 Name:		openstack-quantum
 Version:	2012.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Virtual network service for OpenStack (quantum)
 
 Group:		Applications/System
@@ -398,6 +398,9 @@ fi
 
 
 %changelog
+* Sun Aug 12 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-5
+- Update setup scripts for new DB configuration valiable
+
 * Wed Jul 25 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-4
 - Update to 20120715 essex stable branch snapshot
 
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..6941fb3 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