Support for the ml2 quantum plugin.
Support is added for configuring devstack to use quantum's Modular L2 plugin, ml2. See https://review.openstack.org/#/c/20105/ and the blueprint for details. Either the openvswitch or linuxbridge L2 agent can be used with the ml2 plugin (or both in combination on different nodes). Code configurating devstack for these L2 agents has been moved into separate files so it can be shared between ml2 and the existing monolithic plugins. To use ml2 in devstack, set Q_PLUGIN=ml2 in localrc. By default it will use the openvswitch L2 agent. To use ml2 with the linuxbridge agent, also set Q_AGENT=linuxbridge in localrc. The local, flat, and vlan network types are supported with either agent. Support for openvswitch's gre network type is not yet implemented in ml2. Note that ml2 does not yet return a useful value for binding:vif_type, so nova's GenricVIFDriver cannot currently be used. If using the linuxbridge agent, work around this by setting NOVA_VIF_DRIVER=nova.virt.libvirt.vif.LinuxBridgeVIFDriver in localrc. Implements: blueprint modular-l2 Change-Id: Ib3ed039d25295cf1ab268536cec408af8cd3795a
This commit is contained in:
Bob Kukura
parent
7e37b7314d
commit
c9b0f1abaa
@ -5,19 +5,6 @@
|
|||||||
MY_XTRACE=$(set +o | grep xtrace)
|
MY_XTRACE=$(set +o | grep xtrace)
|
||||||
set +o xtrace
|
set +o xtrace
|
||||||
|
|
||||||
function is_quantum_ovs_base_plugin() {
|
|
||||||
# linuxbridge doesn't use OVS
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_create_nova_conf() {
|
|
||||||
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_install_agent_packages() {
|
|
||||||
install_package bridge-utils
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_common() {
|
function quantum_plugin_configure_common() {
|
||||||
Q_PLUGIN_CONF_PATH=etc/quantum/plugins/linuxbridge
|
Q_PLUGIN_CONF_PATH=etc/quantum/plugins/linuxbridge
|
||||||
Q_PLUGIN_CONF_FILENAME=linuxbridge_conf.ini
|
Q_PLUGIN_CONF_FILENAME=linuxbridge_conf.ini
|
||||||
@ -25,37 +12,6 @@ function quantum_plugin_configure_common() {
|
|||||||
Q_PLUGIN_CLASS="quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2"
|
Q_PLUGIN_CLASS="quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2"
|
||||||
}
|
}
|
||||||
|
|
||||||
function quantum_plugin_configure_debug_command() {
|
|
||||||
iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT external_network_bridge
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_dhcp_agent() {
|
|
||||||
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager quantum.agent.dhcp_agent.DhcpAgentWithStateReport
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_l3_agent() {
|
|
||||||
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge
|
|
||||||
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_plugin_agent() {
|
|
||||||
# Setup physical network interface mappings. Override
|
|
||||||
# ``LB_VLAN_RANGES`` and ``LB_INTERFACE_MAPPINGS`` in ``localrc`` for more
|
|
||||||
# complex physical network configurations.
|
|
||||||
if [[ "$LB_INTERFACE_MAPPINGS" = "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$LB_PHYSICAL_INTERFACE" != "" ]]; then
|
|
||||||
LB_INTERFACE_MAPPINGS=$PHYSICAL_NETWORK:$LB_PHYSICAL_INTERFACE
|
|
||||||
fi
|
|
||||||
if [[ "$LB_INTERFACE_MAPPINGS" != "" ]]; then
|
|
||||||
iniset /$Q_PLUGIN_CONF_FILE LINUX_BRIDGE physical_interface_mappings $LB_INTERFACE_MAPPINGS
|
|
||||||
fi
|
|
||||||
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
|
|
||||||
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
|
|
||||||
else
|
|
||||||
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.firewall.NoopFirewallDriver
|
|
||||||
fi
|
|
||||||
AGENT_BINARY="$QUANTUM_DIR/bin/quantum-linuxbridge-agent"
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_service() {
|
function quantum_plugin_configure_service() {
|
||||||
if [[ "$ENABLE_TENANT_VLANS" = "True" ]]; then
|
if [[ "$ENABLE_TENANT_VLANS" = "True" ]]; then
|
||||||
iniset /$Q_PLUGIN_CONF_FILE VLANS tenant_network_type vlan
|
iniset /$Q_PLUGIN_CONF_FILE VLANS tenant_network_type vlan
|
||||||
@ -81,19 +37,10 @@ function quantum_plugin_configure_service() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function quantum_plugin_setup_interface_driver() {
|
|
||||||
local conf_file=$1
|
|
||||||
iniset $conf_file DEFAULT interface_driver quantum.agent.linux.interface.BridgeInterfaceDriver
|
|
||||||
}
|
|
||||||
|
|
||||||
function has_quantum_plugin_security_group() {
|
function has_quantum_plugin_security_group() {
|
||||||
# 0 means True here
|
# 0 means True here
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
function quantum_plugin_check_adv_test_requirements() {
|
|
||||||
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Restore xtrace
|
# Restore xtrace
|
||||||
$MY_XTRACE
|
$MY_XTRACE
|
||||||
|
|||||||
62
lib/quantum_plugins/linuxbridge_agent
Normal file
62
lib/quantum_plugins/linuxbridge_agent
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
# Quantum Linux Bridge L2 agent
|
||||||
|
# -----------------------------
|
||||||
|
|
||||||
|
# Save trace setting
|
||||||
|
PLUGIN_XTRACE=$(set +o | grep xtrace)
|
||||||
|
set +o xtrace
|
||||||
|
|
||||||
|
function is_quantum_ovs_base_plugin() {
|
||||||
|
# linuxbridge doesn't use OVS
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_create_nova_conf() {
|
||||||
|
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_install_agent_packages() {
|
||||||
|
install_package bridge-utils
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_debug_command() {
|
||||||
|
iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT external_network_bridge
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_dhcp_agent() {
|
||||||
|
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager quantum.agent.dhcp_agent.DhcpAgentWithStateReport
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_l3_agent() {
|
||||||
|
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge
|
||||||
|
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_plugin_agent() {
|
||||||
|
# Setup physical network interface mappings. Override
|
||||||
|
# ``LB_VLAN_RANGES`` and ``LB_INTERFACE_MAPPINGS`` in ``localrc`` for more
|
||||||
|
# complex physical network configurations.
|
||||||
|
if [[ "$LB_INTERFACE_MAPPINGS" = "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$LB_PHYSICAL_INTERFACE" != "" ]]; then
|
||||||
|
LB_INTERFACE_MAPPINGS=$PHYSICAL_NETWORK:$LB_PHYSICAL_INTERFACE
|
||||||
|
fi
|
||||||
|
if [[ "$LB_INTERFACE_MAPPINGS" != "" ]]; then
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE LINUX_BRIDGE physical_interface_mappings $LB_INTERFACE_MAPPINGS
|
||||||
|
fi
|
||||||
|
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
|
||||||
|
else
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.firewall.NoopFirewallDriver
|
||||||
|
fi
|
||||||
|
AGENT_BINARY="$QUANTUM_DIR/bin/quantum-linuxbridge-agent"
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_setup_interface_driver() {
|
||||||
|
local conf_file=$1
|
||||||
|
iniset $conf_file DEFAULT interface_driver quantum.agent.linux.interface.BridgeInterfaceDriver
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_check_adv_test_requirements() {
|
||||||
|
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# Restore xtrace
|
||||||
|
$PLUGIN_XTRACE
|
||||||
62
lib/quantum_plugins/ml2
Normal file
62
lib/quantum_plugins/ml2
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
# Quantum Modular Layer 2 plugin
|
||||||
|
# ------------------------------
|
||||||
|
|
||||||
|
# Save trace setting
|
||||||
|
MY_XTRACE=$(set +o | grep xtrace)
|
||||||
|
set +o xtrace
|
||||||
|
|
||||||
|
# Default openvswitch L2 agent
|
||||||
|
Q_AGENT=${Q_AGENT:-openvswitch}
|
||||||
|
source $TOP_DIR/lib/quantum_plugins/${Q_AGENT}_agent
|
||||||
|
|
||||||
|
function quantum_plugin_configure_common() {
|
||||||
|
Q_PLUGIN_CONF_PATH=etc/quantum/plugins/ml2
|
||||||
|
Q_PLUGIN_CONF_FILENAME=ml2_conf.ini
|
||||||
|
Q_DB_NAME="quantum_ml2"
|
||||||
|
Q_PLUGIN_CLASS="quantum.plugins.ml2.plugin.Ml2Plugin"
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_service() {
|
||||||
|
if [[ "$ENABLE_TENANT_TUNNELS" = "True" ]]; then
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE ml2 tenant_network_types gre
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE ml2_type_gre tunnel_id_ranges $TENANT_TUNNEL_RANGES
|
||||||
|
elif [[ "$ENABLE_TENANT_VLANS" = "True" ]]; then
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE ml2 tenant_network_types vlan
|
||||||
|
else
|
||||||
|
echo "WARNING - The ml2 plugin is using local tenant networks, with no connectivity between hosts."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Override ``ML2_VLAN_RANGES`` and any needed agent configuration
|
||||||
|
# variables in ``localrc`` for more complex physical network
|
||||||
|
# configurations.
|
||||||
|
if [[ "$ML2_VLAN_RANGES" = "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]]; then
|
||||||
|
ML2_VLAN_RANGES=$PHYSICAL_NETWORK
|
||||||
|
if [[ "$TENANT_VLAN_RANGE" != "" ]]; then
|
||||||
|
ML2_VLAN_RANGES=$ML2_VLAN_RANGES:$TENANT_VLAN_RANGE
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if [[ "$ML2_VLAN_RANGES" != "" ]]; then
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE ml2_type_vlan network_vlan_ranges $ML2_VLAN_RANGES
|
||||||
|
fi
|
||||||
|
|
||||||
|
# REVISIT(rkukura): Setting firewall_driver here for
|
||||||
|
# quantum.agent.securitygroups_rpc.is_firewall_enabled() which is
|
||||||
|
# used in the server, in case no L2 agent is configured on the
|
||||||
|
# server's node. If an L2 agent is configured, this will get
|
||||||
|
# overridden with the correct driver. The ml2 plugin should
|
||||||
|
# instead use its own config variable to indicate whether security
|
||||||
|
# groups is enabled, and that will need to be set here instead.
|
||||||
|
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.not.a.real.FirewallDriver
|
||||||
|
else
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.firewall.NoopFirewallDriver
|
||||||
|
fi
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
function has_quantum_plugin_security_group() {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# Restore xtrace
|
||||||
|
$MY_XTRACE
|
||||||
@ -1,25 +1,11 @@
|
|||||||
# Quantum Open vSwtich plugin
|
# Quantum Open vSwitch plugin
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
|
|
||||||
# Save trace setting
|
# Save trace setting
|
||||||
MY_XTRACE=$(set +o | grep xtrace)
|
MY_XTRACE=$(set +o | grep xtrace)
|
||||||
set +o xtrace
|
set +o xtrace
|
||||||
|
|
||||||
source $TOP_DIR/lib/quantum_plugins/ovs_base
|
source $TOP_DIR/lib/quantum_plugins/openvswitch_agent
|
||||||
|
|
||||||
function quantum_plugin_create_nova_conf() {
|
|
||||||
_quantum_ovs_base_configure_nova_vif_driver
|
|
||||||
if [ "$VIRT_DRIVER" = 'xenserver' ]; then
|
|
||||||
iniset $NOVA_CONF DEFAULT xenapi_vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver
|
|
||||||
iniset $NOVA_CONF DEFAULT xenapi_ovs_integration_bridge $XEN_INTEGRATION_BRIDGE
|
|
||||||
# Disable nova's firewall so that it does not conflict with quantum
|
|
||||||
iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_install_agent_packages() {
|
|
||||||
_quantum_ovs_base_install_agent_packages
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_common() {
|
function quantum_plugin_configure_common() {
|
||||||
Q_PLUGIN_CONF_PATH=etc/quantum/plugins/openvswitch
|
Q_PLUGIN_CONF_PATH=etc/quantum/plugins/openvswitch
|
||||||
@ -28,89 +14,6 @@ function quantum_plugin_configure_common() {
|
|||||||
Q_PLUGIN_CLASS="quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2"
|
Q_PLUGIN_CLASS="quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2"
|
||||||
}
|
}
|
||||||
|
|
||||||
function quantum_plugin_configure_debug_command() {
|
|
||||||
_quantum_ovs_base_configure_debug_command
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_dhcp_agent() {
|
|
||||||
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager quantum.agent.dhcp_agent.DhcpAgentWithStateReport
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_l3_agent() {
|
|
||||||
_quantum_ovs_base_configure_l3_agent
|
|
||||||
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_plugin_agent() {
|
|
||||||
# Setup integration bridge
|
|
||||||
_quantum_ovs_base_setup_bridge $OVS_BRIDGE
|
|
||||||
_quantum_ovs_base_configure_firewall_driver
|
|
||||||
|
|
||||||
# Setup agent for tunneling
|
|
||||||
if [[ "$OVS_ENABLE_TUNNELING" = "True" ]]; then
|
|
||||||
# Verify tunnels are supported
|
|
||||||
# REVISIT - also check kernel module support for GRE and patch ports
|
|
||||||
OVS_VERSION=`ovs-vsctl --version | head -n 1 | awk '{print $4;}'`
|
|
||||||
if [ $OVS_VERSION \< "1.4" ] && ! is_service_enabled q-svc ; then
|
|
||||||
die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
|
|
||||||
fi
|
|
||||||
iniset /$Q_PLUGIN_CONF_FILE OVS enable_tunneling True
|
|
||||||
iniset /$Q_PLUGIN_CONF_FILE OVS local_ip $HOST_IP
|
|
||||||
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
|
|
||||||
sudo ovs-vsctl --no-wait -- --may-exist add-br $OVS_PHYSICAL_BRIDGE
|
|
||||||
fi
|
|
||||||
if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then
|
|
||||||
iniset /$Q_PLUGIN_CONF_FILE OVS bridge_mappings $OVS_BRIDGE_MAPPINGS
|
|
||||||
fi
|
|
||||||
AGENT_BINARY="$QUANTUM_DIR/bin/quantum-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"
|
|
||||||
|
|
||||||
# Deal with Dom0's L2 Agent:
|
|
||||||
Q_RR_DOM0_COMMAND="$QUANTUM_DIR/bin/quantum-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.
|
|
||||||
iniset /$Q_PLUGIN_CONF_FILE AGENT root_helper "$Q_RR_DOM0_COMMAND"
|
|
||||||
|
|
||||||
# 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 up domU's L2 agent:
|
|
||||||
|
|
||||||
# Create a bridge "br-$GUEST_INTERFACE_DEFAULT"
|
|
||||||
sudo ovs-vsctl --no-wait -- --may-exist add-br "br-$GUEST_INTERFACE_DEFAULT"
|
|
||||||
# Add $GUEST_INTERFACE_DEFAULT to that bridge
|
|
||||||
sudo ovs-vsctl add-port "br-$GUEST_INTERFACE_DEFAULT" $GUEST_INTERFACE_DEFAULT
|
|
||||||
|
|
||||||
# Set bridge mappings to "physnet1:br-$GUEST_INTERFACE_DEFAULT"
|
|
||||||
iniset "/$Q_PLUGIN_CONF_FILE.domU" OVS bridge_mappings "physnet1:br-$GUEST_INTERFACE_DEFAULT"
|
|
||||||
# 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
|
|
||||||
}
|
|
||||||
|
|
||||||
function quantum_plugin_configure_service() {
|
function quantum_plugin_configure_service() {
|
||||||
if [[ "$ENABLE_TENANT_TUNNELS" = "True" ]]; then
|
if [[ "$ENABLE_TENANT_TUNNELS" = "True" ]]; then
|
||||||
iniset /$Q_PLUGIN_CONF_FILE OVS tenant_network_type gre
|
iniset /$Q_PLUGIN_CONF_FILE OVS tenant_network_type gre
|
||||||
@ -141,18 +44,9 @@ function quantum_plugin_configure_service() {
|
|||||||
_quantum_ovs_base_configure_firewall_driver
|
_quantum_ovs_base_configure_firewall_driver
|
||||||
}
|
}
|
||||||
|
|
||||||
function quantum_plugin_setup_interface_driver() {
|
|
||||||
local conf_file=$1
|
|
||||||
iniset $conf_file DEFAULT interface_driver quantum.agent.linux.interface.OVSInterfaceDriver
|
|
||||||
}
|
|
||||||
|
|
||||||
function has_quantum_plugin_security_group() {
|
function has_quantum_plugin_security_group() {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
function quantum_plugin_check_adv_test_requirements() {
|
|
||||||
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Restore xtrace
|
# Restore xtrace
|
||||||
$MY_XTRACE
|
$MY_XTRACE
|
||||||
|
|||||||
117
lib/quantum_plugins/openvswitch_agent
Normal file
117
lib/quantum_plugins/openvswitch_agent
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
# Quantum Open vSwitch L2 agent
|
||||||
|
# -----------------------------
|
||||||
|
|
||||||
|
# Save trace setting
|
||||||
|
PLUGIN_XTRACE=$(set +o | grep xtrace)
|
||||||
|
set +o xtrace
|
||||||
|
|
||||||
|
source $TOP_DIR/lib/quantum_plugins/ovs_base
|
||||||
|
|
||||||
|
function quantum_plugin_create_nova_conf() {
|
||||||
|
_quantum_ovs_base_configure_nova_vif_driver
|
||||||
|
if [ "$VIRT_DRIVER" = 'xenserver' ]; then
|
||||||
|
iniset $NOVA_CONF DEFAULT xenapi_vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver
|
||||||
|
iniset $NOVA_CONF DEFAULT xenapi_ovs_integration_bridge $XEN_INTEGRATION_BRIDGE
|
||||||
|
# Disable nova's firewall so that it does not conflict with quantum
|
||||||
|
iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_install_agent_packages() {
|
||||||
|
_quantum_ovs_base_install_agent_packages
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_debug_command() {
|
||||||
|
_quantum_ovs_base_configure_debug_command
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_dhcp_agent() {
|
||||||
|
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager quantum.agent.dhcp_agent.DhcpAgentWithStateReport
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_l3_agent() {
|
||||||
|
_quantum_ovs_base_configure_l3_agent
|
||||||
|
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_configure_plugin_agent() {
|
||||||
|
# Setup integration bridge
|
||||||
|
_quantum_ovs_base_setup_bridge $OVS_BRIDGE
|
||||||
|
_quantum_ovs_base_configure_firewall_driver
|
||||||
|
|
||||||
|
# Setup agent for tunneling
|
||||||
|
if [[ "$OVS_ENABLE_TUNNELING" = "True" ]]; then
|
||||||
|
# Verify tunnels are supported
|
||||||
|
# REVISIT - also check kernel module support for GRE and patch ports
|
||||||
|
OVS_VERSION=`ovs-vsctl --version | head -n 1 | awk '{print $4;}'`
|
||||||
|
if [ $OVS_VERSION \< "1.4" ] && ! is_service_enabled q-svc ; then
|
||||||
|
die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
|
||||||
|
fi
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE OVS enable_tunneling True
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE OVS local_ip $HOST_IP
|
||||||
|
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
|
||||||
|
sudo ovs-vsctl --no-wait -- --may-exist add-br $OVS_PHYSICAL_BRIDGE
|
||||||
|
fi
|
||||||
|
if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE OVS bridge_mappings $OVS_BRIDGE_MAPPINGS
|
||||||
|
fi
|
||||||
|
AGENT_BINARY="$QUANTUM_DIR/bin/quantum-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"
|
||||||
|
|
||||||
|
# Deal with Dom0's L2 Agent:
|
||||||
|
Q_RR_DOM0_COMMAND="$QUANTUM_DIR/bin/quantum-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.
|
||||||
|
iniset /$Q_PLUGIN_CONF_FILE AGENT root_helper "$Q_RR_DOM0_COMMAND"
|
||||||
|
|
||||||
|
# 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 up domU's L2 agent:
|
||||||
|
|
||||||
|
# Create a bridge "br-$GUEST_INTERFACE_DEFAULT"
|
||||||
|
sudo ovs-vsctl --no-wait -- --may-exist add-br "br-$GUEST_INTERFACE_DEFAULT"
|
||||||
|
# Add $GUEST_INTERFACE_DEFAULT to that bridge
|
||||||
|
sudo ovs-vsctl add-port "br-$GUEST_INTERFACE_DEFAULT" $GUEST_INTERFACE_DEFAULT
|
||||||
|
|
||||||
|
# Set bridge mappings to "physnet1:br-$GUEST_INTERFACE_DEFAULT"
|
||||||
|
iniset "/$Q_PLUGIN_CONF_FILE.domU" OVS bridge_mappings "physnet1:br-$GUEST_INTERFACE_DEFAULT"
|
||||||
|
# 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
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_setup_interface_driver() {
|
||||||
|
local conf_file=$1
|
||||||
|
iniset $conf_file DEFAULT interface_driver quantum.agent.linux.interface.OVSInterfaceDriver
|
||||||
|
}
|
||||||
|
|
||||||
|
function quantum_plugin_check_adv_test_requirements() {
|
||||||
|
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# Restore xtrace
|
||||||
|
$PLUGIN_XTRACE
|
||||||
Loading…
Reference in New Issue
Block a user