SR-IOV: deprecate agent_required option

When SR-IOV introduce in Juno Agent supported only link state change
Some Intel cards don't support setting link state, so to
resolve it the SR-IOV mech driver supports agent and agent less mode.
From Liberty the SR-IOV agent brings more functionality like
qos and port security so we want to make the agent mandatory.
(of course I already talked with Intel Guys to get their approval)

This patch deprecates the agent_required in Liberty
and updates the agent_required default to be True.

DocImpact
Closes-bug: #1488807
Change-Id: I8799425c2825415ef05bec909e6b4085ffc1e3c5

diff --git a/etc/neutron/plugins/ml2/ml2_conf_sriov.ini b/etc/neutron/plugins/ml2/ml2_conf_sriov.ini
index f9522e7f4d52a40a3bb162bc623dc49e46f91ee4..3d02cb04381ef529502073d765f59e3a470a17a5 100644 (file)
--- a/etc/neutron/plugins/ml2/ml2_conf_sriov.ini
+++ b/etc/neutron/plugins/ml2/ml2_conf_sriov.ini
@@ -9,7 +9,10 @@
 # Example: supported_pci_vendor_devs = 15b3:1004
 #
 # (BoolOpt) Requires running SRIOV neutron agent for port binding
-# agent_required = False
+# agent_required = True
+# DEPRECATED: This option is deprecated in the Liberty release
+# and will be removed in the Mitaka release. From Mitaka the agent will
+# always be required.
 
 [sriov_nic]
 # (ListOpt) Comma-separated list of <physical_network>:<network_device>

diff --git a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py
index dcb7e52d38ff89615f719ff7d14db99e7cb2282d..8cab7c88ed3b90fec1d7bebfd3cb78fa71745bdd 100644 (file)
--- a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py
+++ b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py
@@ -38,9 +38,12 @@ sriov_opts = [
                       "Repository. Default enables support for Intel "
                       "and Mellanox SR-IOV capable NICs")),
     cfg.BoolOpt('agent_required',
-                default=False,
-                help=_("SRIOV neutron agent is required for port binding")),
-
+                default=True,
+                help=_("SRIOV neutron agent is required for port binding. "
+                       'DEPRECATED: This option is deprecated in the Liberty '
+                       'release and will be removed in the Mitaka release. '
+                       'From Mitaka the agent will always be required.'),
+                deprecated_for_removal=True),
 ]
 
 cfg.CONF.register_opts(sriov_opts, "ml2_sriov")