Use default br-int for ovs-agent in Dom0

The default L2 bridge br-int is used commonly in Neutron project
and it will be created by ovs-agent, there is no need for use to
create a specific intergation network and corresponding integration
bridage. This patch is to use the default br-int for ovs-agent in
compute node (Dom0 in XenServer case) to make sure we are align
with others

Change-Id: I675565e1ea6c887d40d7a53f62968c4aa385ecca
This commit is contained in:
Huan Xie 2017-03-09 18:46:30 -08:00
parent befb1601f6
commit 4ae9af402b
1 changed files with 2 additions and 2 deletions

View File

@ -141,7 +141,7 @@ function config_ovs_agent {
iniset $NEUTRON_CORE_PLUGIN_CONF.domU agent minimize_polling False
# Set integration bridge for ovs-agent in compute node (q-domua)
iniset $NEUTRON_CORE_PLUGIN_CONF.domU ovs integration_bridge $XEN_INTEGRATION_BRIDGE
iniset $NEUTRON_CORE_PLUGIN_CONF.domU ovs integration_bridge $OVS_BRIDGE
# Set OVS native interface for ovs-agent in compute node (q-domua)
local dom0_ip=$(echo "$XENAPI_CONNECTION_URL" | cut -d "/" -f 3)
@ -172,7 +172,7 @@ function config_ovs_agent {
function config_nova_compute {
iniset $NOVA_CONF xenserver vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver
iniset $NOVA_CONF xenserver ovs_integration_bridge $XEN_INTEGRATION_BRIDGE
iniset $NOVA_CONF xenserver ovs_integration_bridge $OVS_BRIDGE
iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
# Configure nova-compute, use Dom0's hostname and concat suffix
local ssh_dom0=$(get_dom0_ssh)