Merge "Deprecate use_veth_interconnection config option"

doc/source/contributor/internals/openvswitch_agent.rst

@@ -466,7 +466,7 @@ Implementation Trunk Bridge (Option C)
 
 This implementation is based on this `etherpad <https://etherpad.openstack.org/p/trunk-bridge-tagged-patch-experiment>`_.
 Credits to Bence Romsics.
-The option use_veth_interconnection=true won't be supported, it will probably be deprecated soon,
+The option use_veth_interconnection=true won't be supported, it is deprecated since Victoria,
 see [1]. The IDs used for bridge and port names are truncated.
 
 ::

neutron/conf/plugins/ml2/drivers/ovs_conf.py

@@ -101,6 +101,10 @@ ovs_opts = [
                        "https://docs.openstack.org/api-ref/placement/"
                        "#update-resource-provider-inventories")),
     cfg.BoolOpt('use_veth_interconnection', default=False,
+                deprecated_for_removal=True,
+                deprecated_since="Victoria",
+                deprecated_reason="Patch ports should be used to provide "
+                                  "bridges interconnection.",
                 help=_("Use veths instead of patch ports to interconnect the "
                        "integration bridge to physical networks. "
                        "Support kernel without Open vSwitch patch port "

neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py

@@ -171,6 +171,11 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
             for b in ('br_int', 'br_phys', 'br_tun'))
 
         self.use_veth_interconnection = ovs_conf.use_veth_interconnection
+        if self.use_veth_interconnection:
+            LOG.warning("Usage of veth instead of patch ports for bridges "
+                        "interconnection is deprecated in Victoria and will "
+                        "be removed in W release. Please use patch ports "
+                        "instead.")
         self.veth_mtu = agent_conf.veth_mtu
         self.available_local_vlans = set(six.moves.range(
             n_const.MIN_VLAN_TAG, n_const.MAX_VLAN_TAG + 1))