[openstack-quantum/f18] Ensure libvirt_vif_driver is set with node installation (bug 885932)

[Gary Kotton]

commit fb1536dff2b4e87bbc99b63bd6e8463bfe67cb38
Author: Gary Kotton <gkotton at redhat.com>
Date:   Mon Jan 21 04:57:51 2013 -0500

    Ensure libvirt_vif_driver is set with node installation (bug 885932)
    
    - Cleanup of symbolic link plugin.ini (bug 901959)

 openstack-quantum.spec |    6 +++++-
 quantum-node-setup     |    5 +++++
 quantum-server-setup   |    2 ++
 3 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 98747de..ca37f41 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -4,7 +4,7 @@
 
 Name:		openstack-quantum
 Version:	2012.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Virtual network service for OpenStack (quantum)
 
 Group:		Applications/System
@@ -522,6 +522,10 @@ fi
 
 
 %changelog
+* Mon Jan 21 2013 Gary Kotton <gkotton at redhat.com> - 2012.2.1-2
+- Ensure libvirt_vif_driver is set with node installation (bug 885932)
+- Cleanup of symbolic link plugin.ini (bug 901959)
+
 * Mon Dec  3 2012 Robert Kukura <rkukura at redhat.com> - 2012.2.1-1
 - Update to folsom stable 2012.2.1
 - Turn off PrivateTmp for dhcp_agent and l3_agent (bug 872689)
diff --git a/quantum-node-setup b/quantum-node-setup
index 6e2df5a..bb4f89f 100755
--- a/quantum-node-setup
+++ b/quantum-node-setup
@@ -116,6 +116,8 @@ openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
 case "${QUANTUM_PLUGIN}" in
 "linuxbridge")
         LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
+        rm -f /etc/quantum/plugin.ini
+        ln -s ${LB_CONF} /etc/quantum/plugin.ini
 ;;
 
 "openvswitch")
@@ -124,6 +126,9 @@ case "${QUANTUM_PLUGIN}" in
                 echo "Please install openvswitch"
                 exit 0
         fi
+        LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver
+        rm -f /etc/quantum/plugin.ini
+        ln -s ${OVS_CONF} /etc/quantum/plugin.ini
 ;;
 
 esac
diff --git a/quantum-server-setup b/quantum-server-setup
index 5d182e4..3202b7d 100755
--- a/quantum-server-setup
+++ b/quantum-server-setup
@@ -328,6 +328,7 @@ case "${QUANTUM_PLUGIN}" in
         openstack-config --set ${LB_CONF} LINUX_BRIDGE physical_interface ${NETWORK_DEVICE}
 
 	LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
+	rm -f /etc/quantum/plugin.ini
 	ln -s ${LB_CONF} /etc/quantum/plugin.ini
 ;;
 
@@ -336,6 +337,7 @@ case "${QUANTUM_PLUGIN}" in
 	mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_quantum.* to '${QUANTUM_USER}'@'localhost'"
         openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/ovs_quantum
 	LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver
+	rm -f /etc/quantum/plugin.ini
 	ln -s ${OVS_CONF} /etc/quantum/plugin.ini
 ;;
 esac