Desupport neutron openvswitch and linuxbridge monolithic plugins
These plugins were removed in Juno. Note: this doesn't affect the corresponding ML2 mechanism drivers. Partial-Bug: #1323729 Change-Id: Ia8da1e20a03fef5657ba1584bf83ddd224b5d5f2
This commit is contained in:
YAMAMOTO Takashi
parent
4b6f744e7f
commit
15130cd5fd
29
lib/neutron
29
lib/neutron
|
|
@ -43,21 +43,11 @@
|
|||
# to run Neutron on this host, make sure that q-svc is also in
|
||||
# ``ENABLED_SERVICES``.
|
||||
#
|
||||
# If you're planning to use the Neutron openvswitch plugin, set
|
||||
# ``Q_PLUGIN`` to "openvswitch" and make sure the q-agt service is enabled
|
||||
# in ``ENABLED_SERVICES``. If you're planning to use the Neutron
|
||||
# linuxbridge plugin, set ``Q_PLUGIN`` to "linuxbridge" and make sure the
|
||||
# q-agt service is enabled in ``ENABLED_SERVICES``.
|
||||
#
|
||||
# See "Neutron Network Configuration" below for additional variables
|
||||
# that must be set in localrc for connectivity across hosts with
|
||||
# Neutron.
|
||||
#
|
||||
# With Neutron networking the NETWORK_MANAGER variable is ignored.
|
||||
#
|
||||
# To enable specific configuration options for either the Open vSwitch or
|
||||
# LinuxBridge plugin, please see the top level README file under the
|
||||
# Neutron section.
|
||||
|
||||
|
||||
# Neutron Network Configuration
|
||||
|
|
@ -213,12 +203,11 @@ fi
|
|||
# Provider Network Configurations
|
||||
# --------------------------------
|
||||
|
||||
# The following variables control the Neutron openvswitch and
|
||||
# linuxbridge plugins' allocation of tenant networks and
|
||||
# availability of provider networks. If these are not configured
|
||||
# in ``localrc``, tenant networks will be local to the host (with no
|
||||
# remote connectivity), and no physical resources will be
|
||||
# available for the allocation of provider networks.
|
||||
# The following variables control the Neutron ML2 plugins' allocation
|
||||
# of tenant networks and availability of provider networks. If these
|
||||
# are not configured in ``localrc``, tenant networks will be local to
|
||||
# the host (with no remote connectivity), and no physical resources
|
||||
# will be available for the allocation of provider networks.
|
||||
|
||||
# To disable tunnels (GRE or VXLAN) for tenant networks,
|
||||
# set to False in ``local.conf``.
|
||||
|
|
@ -231,8 +220,8 @@ ENABLE_TENANT_TUNNELS=${ENABLE_TENANT_TUNNELS:-True}
|
|||
TENANT_TUNNEL_RANGES=${TENANT_TUNNEL_RANGES:-1:1000}
|
||||
|
||||
# To use VLANs for tenant networks, set to True in localrc. VLANs
|
||||
# are supported by the openvswitch and linuxbridge plugins, each
|
||||
# requiring additional configuration described below.
|
||||
# are supported by the ML2 plugins, requiring additional configuration
|
||||
# described below.
|
||||
ENABLE_TENANT_VLANS=${ENABLE_TENANT_VLANS:-False}
|
||||
|
||||
# If using VLANs for tenant networks, set in ``localrc`` to specify
|
||||
|
|
@ -252,7 +241,7 @@ TENANT_VLAN_RANGE=${TENANT_VLAN_RANGE:-}
|
|||
# Example: ``PHYSICAL_NETWORK=default``
|
||||
PHYSICAL_NETWORK=${PHYSICAL_NETWORK:-}
|
||||
|
||||
# With the openvswitch plugin, if using VLANs for tenant networks,
|
||||
# With the openvswitch agent, if using VLANs for tenant networks,
|
||||
# or if using flat or VLAN provider networks, set in ``localrc`` to
|
||||
# the name of the OVS bridge to use for the physical network. The
|
||||
# bridge will be created if it does not already exist, but a
|
||||
|
|
@ -262,7 +251,7 @@ PHYSICAL_NETWORK=${PHYSICAL_NETWORK:-}
|
|||
# Example: ``OVS_PHYSICAL_BRIDGE=br-eth1``
|
||||
OVS_PHYSICAL_BRIDGE=${OVS_PHYSICAL_BRIDGE:-}
|
||||
|
||||
# With the linuxbridge plugin, if using VLANs for tenant networks,
|
||||
# With the linuxbridge agent, if using VLANs for tenant networks,
|
||||
# or if using flat or VLAN provider networks, set in ``localrc`` to
|
||||
# the name of the network interface to use for the physical
|
||||
# network.
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
# Neutron Linux Bridge plugin
|
||||
# ---------------------------
|
||||
|
||||
# Save trace setting
|
||||
LBRIDGE_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
source $TOP_DIR/lib/neutron_plugins/linuxbridge_agent
|
||||
|
||||
function neutron_plugin_configure_common {
|
||||
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/linuxbridge
|
||||
Q_PLUGIN_CONF_FILENAME=linuxbridge_conf.ini
|
||||
Q_PLUGIN_CLASS="neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2"
|
||||
}
|
||||
|
||||
function neutron_plugin_configure_service {
|
||||
if [[ "$ENABLE_TENANT_VLANS" == "True" ]]; then
|
||||
iniset /$Q_PLUGIN_CONF_FILE vlans tenant_network_type vlan
|
||||
else
|
||||
echo "WARNING - The linuxbridge plugin is using local tenant networks, with no connectivity between hosts."
|
||||
fi
|
||||
|
||||
# Override ``LB_VLAN_RANGES`` and ``LB_INTERFACE_MAPPINGS`` in ``localrc``
|
||||
# for more complex physical network configurations.
|
||||
if [[ "$LB_VLAN_RANGES" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]]; then
|
||||
LB_VLAN_RANGES=$PHYSICAL_NETWORK
|
||||
if [[ "$TENANT_VLAN_RANGE" != "" ]]; then
|
||||
LB_VLAN_RANGES=$LB_VLAN_RANGES:$TENANT_VLAN_RANGE
|
||||
fi
|
||||
fi
|
||||
if [[ "$LB_VLAN_RANGES" != "" ]]; then
|
||||
iniset /$Q_PLUGIN_CONF_FILE vlans network_vlan_ranges $LB_VLAN_RANGES
|
||||
fi
|
||||
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
|
||||
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
|
||||
else
|
||||
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver
|
||||
fi
|
||||
|
||||
# Define extra "LINUX_BRIDGE" configuration options when q-svc is configured by defining
|
||||
# the array ``Q_SRV_EXTRA_OPTS``.
|
||||
# For Example: ``Q_SRV_EXTRA_OPTS=(foo=true bar=2)``
|
||||
for I in "${Q_SRV_EXTRA_OPTS[@]}"; do
|
||||
# Replace the first '=' with ' ' for iniset syntax
|
||||
iniset /$Q_PLUGIN_CONF_FILE linux_bridge ${I/=/ }
|
||||
done
|
||||
}
|
||||
|
||||
function has_neutron_plugin_security_group {
|
||||
# 0 means True here
|
||||
return 0
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$LBRIDGE_XTRACE
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
# Neutron Linux Bridge L2 agent
|
||||
# -----------------------------
|
||||
|
||||
# Save trace setting
|
||||
PLUGIN_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
function is_neutron_ovs_base_plugin {
|
||||
# linuxbridge doesn't use OVS
|
||||
return 1
|
||||
}
|
||||
|
||||
function neutron_plugin_create_nova_conf {
|
||||
:
|
||||
}
|
||||
|
||||
function neutron_plugin_install_agent_packages {
|
||||
install_package bridge-utils
|
||||
}
|
||||
|
||||
function neutron_plugin_configure_debug_command {
|
||||
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge
|
||||
}
|
||||
|
||||
function neutron_plugin_configure_dhcp_agent {
|
||||
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
|
||||
}
|
||||
|
||||
function neutron_plugin_configure_l3_agent {
|
||||
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge
|
||||
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
|
||||
}
|
||||
|
||||
function neutron_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 neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
|
||||
else
|
||||
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver
|
||||
fi
|
||||
AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-linuxbridge-agent"
|
||||
iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES
|
||||
# Define extra "AGENT" configuration options when q-agt is configured by defining
|
||||
# the array ``Q_AGENT_EXTRA_AGENT_OPTS``.
|
||||
# For Example: ``Q_AGENT_EXTRA_AGENT_OPTS=(foo=true bar=2)``
|
||||
for I in "${Q_AGENT_EXTRA_AGENT_OPTS[@]}"; do
|
||||
# Replace the first '=' with ' ' for iniset syntax
|
||||
iniset /$Q_PLUGIN_CONF_FILE agent ${I/=/ }
|
||||
done
|
||||
# Define extra "LINUX_BRIDGE" configuration options when q-agt is configured by defining
|
||||
# the array ``Q_AGENT_EXTRA_SRV_OPTS``.
|
||||
# For Example: ``Q_AGENT_EXTRA_SRV_OPTS=(foo=true bar=2)``
|
||||
for I in "${Q_AGENT_EXTRA_SRV_OPTS[@]}"; do
|
||||
# Replace the first '=' with ' ' for iniset syntax
|
||||
iniset /$Q_PLUGIN_CONF_FILE linux_bridge ${I/=/ }
|
||||
done
|
||||
}
|
||||
|
||||
function neutron_plugin_setup_interface_driver {
|
||||
local conf_file=$1
|
||||
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver
|
||||
}
|
||||
|
||||
function neutron_plugin_check_adv_test_requirements {
|
||||
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$PLUGIN_XTRACE
|
||||
|
|
@ -1,5 +1,8 @@
|
|||
# Neutron Open vSwitch plugin
|
||||
# ---------------------------
|
||||
# Common code used by cisco and embrane plugins
|
||||
# ---------------------------------------------
|
||||
|
||||
# This module used to be for Open vSwitch monolithic plugin,
|
||||
# which has been removed in Juno.
|
||||
|
||||
# Save trace setting
|
||||
OVS_XTRACE=$(set +o | grep xtrace)
|
||||
|
|
|
|||
Loading…
Reference in New Issue