From: Assaf Muller <amuller@redhat.com>
Date: Mon, 29 Jun 2015 18:02:29 +0000 (-0400)
Subject: Remove unused linux bridge agent configuration options
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=abb7124a518823616c22afbd6bb5fe412b395bcd;p=openstack-build%2Fneutron-build.git

Remove unused linux bridge agent configuration options

This is cruft left from the Linux bridge monolithic plugin,
or from pre-Havana versions of the code.

Change-Id: Id7bb7d7860859283b53f588a940ca21c94fd0e6a
---

diff --git a/etc/neutron/plugins/ml2/linuxbridge_agent.ini b/etc/neutron/plugins/ml2/linuxbridge_agent.ini
index b25d02916..d1a01ba72 100644
--- a/etc/neutron/plugins/ml2/linuxbridge_agent.ini
+++ b/etc/neutron/plugins/ml2/linuxbridge_agent.ini
@@ -1,25 +1,3 @@
-[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.
-#
-# 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.
-#
-# network_vlan_ranges =
-# Example: network_vlan_ranges = physnet1:1000:2999
-
 [linux_bridge]
 # (ListOpt) Comma-separated list of
 # <physical_network>:<physical_interface> tuples mapping physical
@@ -62,12 +40,6 @@
 # Agent's polling interval in seconds
 # polling_interval = 2
 
-# (BoolOpt) Enable server RPC compatibility with old (pre-havana)
-# agents.
-#
-# rpc_support_old_agents = False
-# Example: rpc_support_old_agents = True
-
 # (IntOpt) Set new timeout in seconds for new rpc calls after agent receives
 # SIGTERM. If value is set to 0, rpc timeout won't be changed.
 #
diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
index fa1487c6b..5656b7409 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
@@ -16,21 +16,10 @@ from oslo_config import cfg
 
 from neutron.agent.common import config
 
-DEFAULT_VLAN_RANGES = []
 DEFAULT_INTERFACE_MAPPINGS = []
 DEFAULT_VXLAN_GROUP = '224.0.0.1'
 
 
-vlan_opts = [
-    cfg.StrOpt('tenant_network_type', default='local',
-               help=_("Network type for tenant networks "
-                      "(local, vlan, or none)")),
-    cfg.ListOpt('network_vlan_ranges',
-                default=DEFAULT_VLAN_RANGES,
-                help=_("List of <physical_network>:<vlan_min>:<vlan_max> "
-                       "or <physical_network>")),
-]
-
 vxlan_opts = [
     cfg.BoolOpt('enable_vxlan', default=True,
                 help=_("Enable VXLAN on the agent. Can be enabled when "
@@ -60,8 +49,6 @@ agent_opts = [
     cfg.IntOpt('polling_interval', default=2,
                help=_("The number of seconds the agent will wait between "
                       "polling for local device changes.")),
-    cfg.BoolOpt('rpc_support_old_agents', default=False,
-                help=_("Enable server RPC compatibility with old agents")),
     cfg.IntOpt('quitting_rpc_timeout', default=10,
                help=_("Set new timeout in seconds for new rpc calls after "
                       "agent receives SIGTERM. If value is set to 0, rpc "
@@ -69,7 +56,6 @@ agent_opts = [
 ]
 
 
-cfg.CONF.register_opts(vlan_opts, "VLANS")
 cfg.CONF.register_opts(vxlan_opts, "VXLAN")
 cfg.CONF.register_opts(bridge_opts, "LINUX_BRIDGE")
 cfg.CONF.register_opts(agent_opts, "AGENT")