Merge "openvswitch: Remove no longer used options"

etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini

@@ -1,52 +1,13 @@
 [ovs]
-# (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 either change this
-# to 'vlan' and configure network_vlan_ranges below or change this to
-# 'gre' or 'vxlan' and configure tunnel_id_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 = gre
-# Example: tenant_network_type = vxlan
-
-# (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 gre, vxlan and local networks may be created.
-#
-# network_vlan_ranges =
-# Example: network_vlan_ranges = physnet1:1000:2999
-
 # (BoolOpt) Set to True in the server and the agents to enable support
 # for GRE or VXLAN networks. Requires kernel support for OVS patch ports and
 # GRE or VXLAN tunneling.
 #
 # WARNING: This option will be deprecated in the Icehouse release, at which
-#          point setting tunnel_type below will be required to enable
-#          tunneling.
+#          point setting tunnel_types will be required to enable tunneling.
 #
 # enable_tunneling = False
 
-# (StrOpt) The type of tunnel network, if any, supported by the plugin. If
-# this is set, it will cause tunneling to be enabled. If this is not set and
-# the option enable_tunneling is set, this will default to 'gre'.
-#
-# tunnel_type =
-# Example: tunnel_type = gre
-# Example: tunnel_type = vxlan
-
-# (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples
-# enumerating ranges of GRE or VXLAN tunnel IDs that are available for
-# tenant network allocation if tenant_network_type is 'gre' or 'vxlan'.
-#
-# tunnel_id_ranges =
-# Example: tunnel_id_ranges = 1:1000
-
 # Do not change this parameter unless you have a good reason to.
 # This is the name of the OVS integration bridge. There is one per hypervisor.
 # The integration bridge acts as a virtual "patch bay". All VM VIFs are
@@ -55,7 +16,7 @@
 #
 # integration_bridge = br-int
 
-# Only used for the agent if tunnel_id_ranges (above) is not empty for
+# Only used for the agent if tunnel_id_ranges is not empty for
 # the server.  In most cases, the default value should be fine.
 #
 # tunnel_bridge = br-tun
@@ -66,7 +27,7 @@
 # Peer patch port in tunnel bridge for integration bridge
 # tun_peer_patch_port = patch-int
 
-# Uncomment this line for the agent if tunnel_id_ranges (above) is not
+# Uncomment this line for the agent if tunnel_id_ranges is not
 # empty for the server. Set local-ip to be the local IP address of
 # this hypervisor.
 #
@@ -77,8 +38,8 @@
 # bridge names to be used for flat and VLAN networks. The length of
 # bridge names should be no more than 11. Each bridge must
 # exist, and should have a physical network interface configured as a
-# port. All physical networks listed in network_vlan_ranges on the
-# server should have mappings to appropriate bridges on each agent.
+# port. All physical networks configured on the server should have
+# mappings to appropriate bridges on each agent.
 #
 # bridge_mappings =
 # Example: bridge_mappings = physnet1:br-eth1
@@ -102,10 +63,8 @@
 # (ListOpt) The types of tenant network tunnels supported by the agent.
 # Setting this will enable tunneling support in the agent. This can be set to
 # either 'gre' or 'vxlan'. If this is unset, it will default to [] and
-# disable tunneling support in the agent. When running the agent with the OVS
-# plugin, this value must be the same as "tunnel_type" in the "[ovs]" section.
-# When running the agent with ML2, you can specify as many values here as
-# your compute hosts supports.
+# disable tunneling support in the agent.
+# You can specify as many values here as your compute hosts supports.
 #
 # tunnel_types =
 # Example: tunnel_types = gre
@@ -164,25 +123,17 @@
 #
 # 1. With VLANs on eth1.
 # [ovs]
-# network_vlan_ranges = default:2000:3999
-# tunnel_id_ranges =
 # integration_bridge = br-int
 # bridge_mappings = default:br-eth1
 #
 # 2. With GRE tunneling.
 # [ovs]
-# network_vlan_ranges =
-# tunnel_id_ranges = 1:1000
 # integration_bridge = br-int
 # tunnel_bridge = br-tun
 # local_ip = 10.0.0.3
 #
 # 3. With VXLAN tunneling.
 # [ovs]
-# network_vlan_ranges =
-# tenant_network_type = vxlan
-# tunnel_type = vxlan
-# tunnel_id_ranges = 1:1000
 # integration_bridge = br-int
 # tunnel_bridge = br-tun
 # local_ip = 10.0.0.3

neutron/plugins/openvswitch/common/config.py

@@ -43,19 +43,6 @@ ovs_opts = [
                 default=DEFAULT_BRIDGE_MAPPINGS,
                 help=_("List of <physical_network>:<bridge>. "
                        "Deprecated for ofagent.")),
-    cfg.StrOpt('tenant_network_type', default='local',
-               help=_("Network type for tenant networks "
-                      "(local, vlan, gre, vxlan, or none).")),
-    cfg.ListOpt('network_vlan_ranges',
-                default=DEFAULT_VLAN_RANGES,
-                help=_("List of <physical_network>:<vlan_min>:<vlan_max> "
-                       "or <physical_network>.")),
-    cfg.ListOpt('tunnel_id_ranges',
-                default=DEFAULT_TUNNEL_RANGES,
-                help=_("List of <tun_min>:<tun_max>.")),
-    cfg.StrOpt('tunnel_type', default='',
-               help=_("The type of tunnels to use when utilizing tunnels, "
-                      "either 'gre' or 'vxlan'.")),
     cfg.BoolOpt('use_veth_interconnection', default=False,
                 help=_("Use veths instead of patch ports to interconnect the "
                        "integration bridge to physical bridges.")),

neutron/tests/unit/openvswitch/test_ovs_defaults.py

@@ -27,9 +27,6 @@ class ConfigurationTest(base.BaseTestCase):
         self.assertEqual('br-tun', cfg.CONF.OVS.tunnel_bridge)
         self.assertEqual(2, cfg.CONF.AGENT.polling_interval)
         self.assertEqual('sudo', cfg.CONF.AGENT.root_helper)
-        self.assertEqual('local', cfg.CONF.OVS.tenant_network_type)
         self.assertEqual(0, len(cfg.CONF.OVS.bridge_mappings))
-        self.assertEqual(0, len(cfg.CONF.OVS.network_vlan_ranges))
-        self.assertEqual(0, len(cfg.CONF.OVS.tunnel_id_ranges))
         self.assertFalse(cfg.CONF.AGENT.l2_population)
         self.assertFalse(cfg.CONF.AGENT.arp_responder)