Deprecate use_namespaces option

Change-Id: I3a769a0195aba45ec836b669fe049f0b8eba884f
Closes-Bug: #1435382

diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index ea13ba6c0ceb1998b0ab58135dfc2e1c785b16b6..93796acf829ce701b2d90e648e08f54c7c33fceb 100644 (file)
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -31,7 +31,9 @@
 # dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
 
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
-# iproute2 package that supports namespaces).
+# iproute2 package that supports namespaces). This option is deprecated and
+# will be removed in a future release, at which point the old behavior of
+# use_namespaces = True will be enforced.
 # use_namespaces = True
 
 # The DHCP server can assist with providing metadata support on isolated

diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini
index eca07f0f362ce064b926d17a5ae7410cc0bd98b6..597ab788662e0e25807e6befea74fda605026dc0 100644 (file)
--- a/etc/l3_agent.ini
+++ b/etc/l3_agent.ini
@@ -19,7 +19,9 @@
 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
-# iproute2 package that supports namespaces).
+# iproute2 package that supports namespaces). This option is deprecated and
+# will be removed in a future release, at which point the old behavior of
+# use_namespaces = True will be enforced.
 # use_namespaces = True
 
 # If use_namespaces is set as False then the agent can only configure one router.

diff --git a/etc/metering_agent.ini b/etc/metering_agent.ini
index 88826ce79f0f582ad556bfae2f7f419f81f9ce75..ac91234611dfc1f5382e8607aa174f9ca68c8bd8 100644 (file)
--- a/etc/metering_agent.ini
+++ b/etc/metering_agent.ini
@@ -15,4 +15,6 @@
 
 # interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 
+# This option is deprecated and will be removed in a future release,
+# at which point the old behavior of use_namespaces = True will be enforced.
 # use_namespaces = True

diff --git a/neutron/agent/common/config.py b/neutron/agent/common/config.py
index 950f951dd87af21644d9364e1f0cf37c6b4cf281..3f533fa3a34acb5a0a4a6cf1f4a39c2dfdae1201 100644 (file)
--- a/neutron/agent/common/config.py
+++ b/neutron/agent/common/config.py
@@ -53,7 +53,9 @@ INTERFACE_DRIVER_OPTS = [
 
 USE_NAMESPACES_OPTS = [
     cfg.BoolOpt('use_namespaces', default=True,
-                help=_("Allow overlapping IP.")),
+                help=_("Allow overlapping IP. This option is deprecated and "
+                       "will be removed in a future release."),
+                deprecated_for_removal=True),
 ]
 
 IPTABLES_OPTS = [