Deprecate "router_delete_namespaces" and "dhcp_delete_namespaces"

These 2 configuration options are no longer be necessary.

They are marked as deprecated in this release and will be removed in the
next release.

Change-Id: I4e02a291738b16c7c9b7600f0bc9a47fb1318569
Partial-Bug: #1418079

diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index a0adccaaae6f236c90349fdcc32844f10ffc659e..0b3721b959e59789aa284abb54b5f0aa7cebdc8b 100644 (file)
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -82,6 +82,9 @@
 # Disable this if you hit the issue in
 # https://bugs.launchpad.net/neutron/+bug/1052535 or if
 # you are sure that your version of iproute suffers from the problem.
+# This should not be a problem any more.  Refer to bug:
+# https://bugs.launchpad.net/neutron/+bug/1418079
+# This option is deprecated and will be removed in the M release
 # dhcp_delete_namespaces = True
 
 # Timeout for ovs-vsctl commands.

diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini
index 0d56436bf8e98338fa5ff3a84ffad4744931ee4b..b49797d02fafbe7faa4a1a47ac2374ea9be44658 100644 (file)
--- a/etc/l3_agent.ini
+++ b/etc/l3_agent.ini
@@ -91,6 +91,9 @@
 # https://bugs.launchpad.net/neutron/+bug/1052535 or if
 # you are sure that your version of iproute suffers from the problem.
 # If True, namespaces will be deleted when a router is destroyed.
+# This should not be a problem any more.  Refer to bug:
+# https://bugs.launchpad.net/neutron/+bug/1418079
+# This option is deprecated and will be removed in the M release
 # router_delete_namespaces = True
 
 # Timeout for ovs-vsctl commands.

diff --git a/neutron/agent/dhcp/config.py b/neutron/agent/dhcp/config.py
index 0cf60aa1f71bdad0e4a4ca3bd4f8b1cd0e1ba6e8..d00a2fad6a4bb239a7dc89b64495bb51eb4c1acc 100644 (file)
--- a/neutron/agent/dhcp/config.py
+++ b/neutron/agent/dhcp/config.py
@@ -50,7 +50,10 @@ DNSMASQ_OPTS = [
                        'used as forwarders.'),
                 deprecated_name='dnsmasq_dns_server'),
     cfg.BoolOpt('dhcp_delete_namespaces', default=True,
-                help=_("Delete namespace after removing a dhcp server.")),
+                help=_("Delete namespace after removing a dhcp server."
+                       "This option is deprecated and "
+                       "will be removed in a future release."),
+                deprecated_for_removal=True),
     cfg.IntOpt(
         'dnsmasq_lease_max',
         default=(2 ** 24),

diff --git a/neutron/agent/l3/config.py b/neutron/agent/l3/config.py
index 98cfa3a88fc4e6cf765dd0fc31929a173009f738..e98147765e297cb54cbce4847d0446f6bcc4a1c3 100644 (file)
--- a/neutron/agent/l3/config.py
+++ b/neutron/agent/l3/config.py
@@ -77,7 +77,10 @@ OPTS = [
     cfg.BoolOpt('enable_metadata_proxy', default=True,
                 help=_("Allow running metadata proxy.")),
     cfg.BoolOpt('router_delete_namespaces', default=True,
-                help=_("Delete namespace after removing a router.")),
+                help=_("Delete namespace after removing a router."
+                       "This option is deprecated and "
+                       "will be removed in a future release."),
+                deprecated_for_removal=True),
     cfg.StrOpt('metadata_access_mark',
                default='0x1',
                help=_('Iptables mangle mark used to mark metadata valid '