From 830e9114817765efc93c772dcbc735a6bb28a7ff Mon Sep 17 00:00:00 2001 From: Anthony Chow Date: Tue, 23 Jun 2015 22:05:23 -0700 Subject: [PATCH] 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 --- etc/dhcp_agent.ini | 3 +++ etc/l3_agent.ini | 3 +++ neutron/agent/dhcp/config.py | 5 ++++- neutron/agent/l3/config.py | 5 ++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini index a0adccaaa..0b3721b95 100644 --- 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 0d56436bf..b49797d02 100644 --- 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 0cf60aa1f..d00a2fad6 100644 --- 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 98cfa3a88..e98147765 100644 --- 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 ' -- 2.45.2