2864150940
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
136 lines
5.4 KiB
Bash
136 lines
5.4 KiB
Bash
#!/bin/bash
|
|
#
|
|
# Neutron Open vSwitch L2 agent
|
|
# -----------------------------
|
|
|
|
# Save trace setting
|
|
_XTRACE_NEUTRON_OVSL2=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
source $TOP_DIR/lib/neutron_plugins/ovs_base
|
|
|
|
function neutron_plugin_create_nova_conf {
|
|
_neutron_ovs_base_configure_nova_vif_driver
|
|
if [ "$VIRT_DRIVER" == 'xenserver' ]; then
|
|
iniset $NOVA_CONF xenserver vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver
|
|
iniset $NOVA_CONF xenserver ovs_integration_bridge $XEN_INTEGRATION_BRIDGE
|
|
# Disable nova's firewall so that it does not conflict with neutron
|
|
iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
|
|
fi
|
|
}
|
|
|
|
function neutron_plugin_install_agent_packages {
|
|
_neutron_ovs_base_install_agent_packages
|
|
}
|
|
|
|
function neutron_plugin_configure_debug_command {
|
|
_neutron_ovs_base_configure_debug_command
|
|
}
|
|
|
|
function neutron_plugin_configure_dhcp_agent {
|
|
local conf_file=$1
|
|
:
|
|
}
|
|
|
|
function neutron_plugin_configure_l3_agent {
|
|
local conf_file=$1
|
|
_neutron_ovs_base_configure_l3_agent
|
|
}
|
|
|
|
function neutron_plugin_configure_plugin_agent {
|
|
# Setup integration bridge
|
|
_neutron_ovs_base_setup_bridge $OVS_BRIDGE
|
|
_neutron_ovs_base_configure_firewall_driver
|
|
|
|
# Setup agent for tunneling
|
|
if [[ "$OVS_ENABLE_TUNNELING" == "True" ]]; then
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs tunnel_bridge $OVS_TUNNEL_BRIDGE
|
|
fi
|
|
|
|
# Setup physical network bridge mappings. Override
|
|
# ``OVS_VLAN_RANGES`` and ``OVS_BRIDGE_MAPPINGS`` in ``localrc`` for more
|
|
# complex physical network configurations.
|
|
if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then
|
|
OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE
|
|
|
|
# Configure bridge manually with physical interface as port for multi-node
|
|
_neutron_ovs_base_add_bridge $OVS_PHYSICAL_BRIDGE
|
|
fi
|
|
if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs bridge_mappings $OVS_BRIDGE_MAPPINGS
|
|
fi
|
|
AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-openvswitch-agent"
|
|
|
|
if [ "$VIRT_DRIVER" == 'xenserver' ]; then
|
|
# Make a copy of our config for domU
|
|
sudo cp /$Q_PLUGIN_CONF_FILE "/$Q_PLUGIN_CONF_FILE.domU"
|
|
|
|
# change domU's config file to STACK_USER
|
|
sudo chown $STACK_USER:$STACK_USER /$Q_PLUGIN_CONF_FILE.domU
|
|
|
|
# Deal with Dom0's L2 Agent:
|
|
Q_RR_DOM0_COMMAND="$NEUTRON_BIN_DIR/neutron-rootwrap-xen-dom0 $Q_RR_CONF_FILE"
|
|
|
|
# For now, duplicate the xen configuration already found in nova.conf
|
|
iniset $Q_RR_CONF_FILE xenapi xenapi_connection_url "$XENAPI_CONNECTION_URL"
|
|
iniset $Q_RR_CONF_FILE xenapi xenapi_connection_username "$XENAPI_USER"
|
|
iniset $Q_RR_CONF_FILE xenapi xenapi_connection_password "$XENAPI_PASSWORD"
|
|
|
|
# Under XS/XCP, the ovs agent needs to target the dom0
|
|
# integration bridge. This is enabled by using a root wrapper
|
|
# that executes commands on dom0 via a XenAPI plugin.
|
|
# XenAPI does not support daemon rootwrap now, so set root_helper_daemon empty
|
|
iniset /$Q_PLUGIN_CONF_FILE agent root_helper "$Q_RR_DOM0_COMMAND"
|
|
iniset /$Q_PLUGIN_CONF_FILE agent root_helper_daemon ""
|
|
|
|
# Disable minimize polling, so that it can always detect OVS and Port changes
|
|
# This is a problem of xenserver + neutron, bug has been reported
|
|
# https://bugs.launchpad.net/neutron/+bug/1495423
|
|
iniset /$Q_PLUGIN_CONF_FILE agent minimize_polling False
|
|
|
|
# Set "physical" mapping
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs bridge_mappings "physnet1:$FLAT_NETWORK_BRIDGE"
|
|
|
|
# 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"
|
|
_neutron_ovs_base_add_bridge "br-$VLAN_INTERFACE"
|
|
# Add $VLAN_INTERFACE to that bridge
|
|
sudo ovs-vsctl -- --may-exist add-port "br-$VLAN_INTERFACE" $VLAN_INTERFACE
|
|
|
|
# Create external bridge and add port
|
|
_neutron_ovs_base_add_public_bridge
|
|
sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $PUBLIC_INTERFACE
|
|
|
|
# Set bridge mappings to "physnet1:br-$GUEST_INTERFACE_DEFAULT"
|
|
iniset "/$Q_PLUGIN_CONF_FILE.domU" ovs bridge_mappings "physnet1:br-$VLAN_INTERFACE,physnet-ex:$PUBLIC_BRIDGE"
|
|
# Set integration bridge to domU's
|
|
iniset "/$Q_PLUGIN_CONF_FILE.domU" ovs integration_bridge $OVS_BRIDGE
|
|
# Set root wrap
|
|
iniset "/$Q_PLUGIN_CONF_FILE.domU" agent root_helper "$Q_RR_COMMAND"
|
|
fi
|
|
iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs datapath_type $OVS_DATAPATH_TYPE
|
|
}
|
|
|
|
function neutron_plugin_setup_interface_driver {
|
|
local conf_file=$1
|
|
iniset $conf_file DEFAULT interface_driver openvswitch
|
|
}
|
|
|
|
function neutron_plugin_check_adv_test_requirements {
|
|
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
|
|
}
|
|
|
|
# Restore xtrace
|
|
$_XTRACE_NEUTRON_OVSL2
|