1. devstack
  2. Commit d7150e9bbce54479028c5c744d5648ae530925ea
Browse code

Add configurable use of veths with Quantum+OVS.

* This patch adds the ability to configure use of veths with
OVS via the Q_OVS_USE_VETH variable. The use of veths with OVS
is required to support namespaces on RHEL.
* Supports bug 1171727

Change-Id: I5f557d659684ead99a3e5e2b4df787699d9d3f05

Maru Newby authored on 2013/04/23 15:16:11
Showing 2 changed files
lib/quantum
History View file @ d7150e9
... ... 
@@ -82,6 +82,8 @@ Q_ADMIN_USERNAME=${Q_ADMIN_USERNAME:-quantum}
82 82 
 Q_AUTH_STRATEGY=${Q_AUTH_STRATEGY:-keystone}
83 83 
 # Use namespace or not
84 84 
 Q_USE_NAMESPACE=${Q_USE_NAMESPACE:-True}
85 
+# RHEL's support for namespaces requires using veths with ovs
86 
+Q_OVS_USE_VETH=${Q_OVS_USE_VETH:-False}
85 87 
 Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True}
86 88 
 # Meta data IP
87 89 
 Q_META_DATA_IP=${Q_META_DATA_IP:-$HOST_IP}
... ... 
@@ -665,6 +667,11 @@ function _quantum_commentout_keystone_authtoken() {
665 665 
 }
666 666
667 667 
 function _quantum_setup_interface_driver() {
668 
+
669 
+    # ovs_use_veth needs to be set before the plugin configuration
670 
+    # occurs to allow plugins to override the setting.
671 
+    iniset $1 DEFAULT ovs_use_veth $Q_OVS_USE_VETH
672 
+
668 673 
     quantum_plugin_setup_interface_driver $1
669 674 
 }
670 675
lib/quantum_plugins/services/agent_loadbalancer
History View file @ d7150e9
... ... 
@@ -34,6 +34,11 @@ function quantum_agent_lbaas_configure_agent() {
34 34
35 35 
     cp $QUANTUM_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME
36 36
37 
+    iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT use_namespaces $Q_USE_NAMESPACE
38 
+    # ovs_use_veth needs to be set before the plugin configuration
39 
+    # occurs to allow plugins to override the setting.
40 
+    iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT ovs_use_veth $Q_OVS_USE_VETH
41 
+
37 42 
     quantum_plugin_setup_interface_driver $LBAAS_AGENT_CONF_FILENAME
38 43
39 44 
     if is_fedora; then