openstack/devstack
Code Issues Proposed changes

Make neutron ml2 use ovs native interface

Browse Source 
Neutron has changed to use ovs native interface by default, but when
the hypervisor is XenServer, we cannot use ovs native interface without
extra configurations in neutron-openvswitch-agent(q-agt) in compute
node.

This patch is to add the needed configurations automatically during
deployment, so user needn't to do it manually and restart q-agt.

Change-Id: Ibc69d3cdb4d75833f2ac16840c62bcacf460dd4f
This commit is contained in:
Huan Xie 2016-09-20 06:49:50 +00:00 committed by Sean M. Collins
parent b9f697719b
commit 2864150940
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/neutron_plugins/openvswitch_agent
View File

@ -95,6 +95,11 @@ function neutron_plugin_configure_plugin_agent {
# XEN_INTEGRATION_BRIDGE is the integration bridge in dom0
iniset /$Q_PLUGIN_CONF_FILE ovs integration_bridge $XEN_INTEGRATION_BRIDGE
# Set OVS native interface for ovs-agent in compute node
XEN_DOM0_IP=$(echo "$XENAPI_CONNECTION_URL" | cut -d "/" -f 3)
iniset /$Q_PLUGIN_CONF_FILE ovs ovsdb_connection tcp:$XEN_DOM0_IP:6640
iniset /$Q_PLUGIN_CONF_FILE ovs of_listen_address $HOST_IP
# Set up domU's L2 agent:
# Create a bridge "br-$VLAN_INTERFACE"

9
lib/nova_plugins/hypervisor-xenserver
View File

@ -93,6 +93,15 @@ CRONTAB
if is_service_enabled neutron; then
# Remove restriction on linux bridge in Dom0 when neutron is enabled
$ssh_dom0 "rm -f /etc/modprobe.d/blacklist-bridge*"
count=`$ssh_dom0 "iptables -t filter -L XenServerDevstack |wc -l"`
if [ "$count" = "0" ]; then
{
echo "iptables -t filter --new XenServerDevstack"
echo "iptables -t filter -I INPUT -j XenServerDevstack"
echo "iptables -t filter -I XenServerDevstack -p tcp --dport 6640 -j ACCEPT"
} | $ssh_dom0
fi
fi
}