openstack/devstack
Code Issues Proposed changes

Add configurable use of veths with Quantum+OVS.

Browse Source 
* 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
This commit is contained in:
Maru Newby 2013-04-23 06:16:11 +00:00
parent cd30ad90b8
commit d7150e9bbc
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/quantum
View File

@ -82,6 +82,8 @@ Q_ADMIN_USERNAME=${Q_ADMIN_USERNAME:-quantum}
Q_AUTH_STRATEGY=${Q_AUTH_STRATEGY:-keystone} Q_AUTH_STRATEGY=${Q_AUTH_STRATEGY:-keystone}
# Use namespace or not # Use namespace or not
Q_USE_NAMESPACE=${Q_USE_NAMESPACE:-True} Q_USE_NAMESPACE=${Q_USE_NAMESPACE:-True}
# RHEL's support for namespaces requires using veths with ovs
Q_OVS_USE_VETH=${Q_OVS_USE_VETH:-False}
Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True} Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True}
# Meta data IP # Meta data IP
Q_META_DATA_IP=${Q_META_DATA_IP:-$HOST_IP} Q_META_DATA_IP=${Q_META_DATA_IP:-$HOST_IP}
@ -665,6 +667,11 @@ function _quantum_commentout_keystone_authtoken() {
} }
function _quantum_setup_interface_driver() { function _quantum_setup_interface_driver() {
# ovs_use_veth needs to be set before the plugin configuration
# occurs to allow plugins to override the setting.
iniset $1 DEFAULT ovs_use_veth $Q_OVS_USE_VETH
quantum_plugin_setup_interface_driver $1 quantum_plugin_setup_interface_driver $1
} }

5
lib/quantum_plugins/services/agent_loadbalancer
View File

@ -34,6 +34,11 @@ function quantum_agent_lbaas_configure_agent() {
cp $QUANTUM_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME cp $QUANTUM_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME
iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT use_namespaces $Q_USE_NAMESPACE
# ovs_use_veth needs to be set before the plugin configuration
# occurs to allow plugins to override the setting.
iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT ovs_use_veth $Q_OVS_USE_VETH
quantum_plugin_setup_interface_driver $LBAAS_AGENT_CONF_FILENAME quantum_plugin_setup_interface_driver $LBAAS_AGENT_CONF_FILENAME
if is_fedora; then if is_fedora; then