56cac98626
The linuxbridge, openvswitch, and hyperv plugins all use the same basic RPC interface between their plugins and L2 agents. But the attributes describing a virtual network passed from the plugin to the agent over this interface differed for historical reasons. The openvswitch and hyperv plugins each pass network_type, physical_network, and segmentation_id attributes, whereas the linuxbridge plugin previously passed vlan_id and physical_network attributes, using special vlan_id values to indicate flat or local network types. This patch changes the linuxbridge plugin to pass network_type and segmentation_id attributes instead of the vlan_id attribute, bringing its message formats into sync with the other plugins. RPC compatibility is required for blueprint modular-l2 so that the ml2 plugin can work with all three existing types of L2 agent. This RPC message format change is also required for blueprint vxlan-linuxbridge. Unlike the vxlan-linuxbridge patch on which it is based (see https://review.openstack.org/#/c/26516/), this patch does not bump the linuxbridge RPC version number, as the ml2 plugin will require all three L2 agents to use the same RPC version. Instead, the updated linuxbridge agent maintains compatibility with old linuxbridge plugins by accepting either the old or new attributes. There is also a configuration option, currently turned on by default, to enable the updated linuxbridge plugin to pass the vlan_id attribute expected by old linuxbridge agents along with the new attributes. These message format compatibility mechanisms are intended to aid during upgrades, and can eventually be removed. Change-Id: I7cc1c9f96b09db6bab2c7d9f2b30b79fa4dab919
70 lines
2.8 KiB
INI
70 lines
2.8 KiB
INI
[VLANS]
|
|
# (StrOpt) Type of network to allocate for tenant networks. The
|
|
# default value 'local' is useful only for single-box testing and
|
|
# provides no connectivity between hosts. You MUST change this to
|
|
# 'vlan' and configure network_vlan_ranges below in order for tenant
|
|
# networks to provide connectivity between hosts. Set to 'none' to
|
|
# disable creation of tenant networks.
|
|
#
|
|
# Default: tenant_network_type = local
|
|
# Example: tenant_network_type = vlan
|
|
|
|
# (ListOpt) Comma-separated list of
|
|
# <physical_network>[:<vlan_min>:<vlan_max>] tuples enumerating ranges
|
|
# of VLAN IDs on named physical networks that are available for
|
|
# allocation. All physical networks listed are available for flat and
|
|
# VLAN provider network creation. Specified ranges of VLAN IDs are
|
|
# available for tenant network allocation if tenant_network_type is
|
|
# 'vlan'. If empty, only local networks may be created.
|
|
#
|
|
# Default: network_vlan_ranges =
|
|
# Example: network_vlan_ranges = physnet1:1000:2999
|
|
|
|
[DATABASE]
|
|
# This line MUST be changed to actually run the plugin.
|
|
# Example:
|
|
# sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
|
|
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
sql_connection = sqlite://
|
|
# Database reconnection retry times - in event connectivity is lost
|
|
# set to -1 implies an infinite retry count
|
|
# sql_max_retries = 10
|
|
# Database reconnection interval in seconds - if the initial connection to the
|
|
# database fails
|
|
reconnect_interval = 2
|
|
# Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
|
|
# sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
|
|
# sql_dbpool_enable = False
|
|
# Minimum number of SQL connections to keep open in a pool
|
|
# sql_min_pool_size = 1
|
|
# Maximum number of SQL connections to keep open in a pool
|
|
# sql_max_pool_size = 5
|
|
# Timeout in seconds before idle sql connections are reaped
|
|
# sql_idle_timeout = 3600
|
|
|
|
[LINUX_BRIDGE]
|
|
# (ListOpt) Comma-separated list of
|
|
# <physical_network>:<physical_interface> tuples mapping physical
|
|
# network names to the agent's node-specific physical network
|
|
# interfaces to be used for flat and VLAN networks. All physical
|
|
# networks listed in network_vlan_ranges on the server should have
|
|
# mappings to appropriate interfaces on each agent.
|
|
#
|
|
# Default: physical_interface_mappings =
|
|
# Example: physical_interface_mappings = physnet1:eth1
|
|
|
|
[AGENT]
|
|
# Agent's polling interval in seconds
|
|
polling_interval = 2
|
|
|
|
# (BoolOpt) Enable server RPC compatibility with old (pre-havana)
|
|
# agents.
|
|
#
|
|
# Default: rpc_support_old_agents = True
|
|
# Example: rpc_support_old_agents = False
|
|
|
|
[SECURITYGROUP]
|
|
# Firewall driver for realizing quantum security group function
|
|
firewall_driver = quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
|