From 9902c101f26c72bd416e07c4539a4d63945a86c7 Mon Sep 17 00:00:00 2001 From: Assaf Muller Date: Mon, 23 Mar 2015 11:27:00 -0400 Subject: [PATCH] Deprecate use_namespaces option Change-Id: I3a769a0195aba45ec836b669fe049f0b8eba884f Closes-Bug: #1435382 --- etc/dhcp_agent.ini | 4 +++- etc/l3_agent.ini | 4 +++- etc/metering_agent.ini | 2 ++ neutron/agent/common/config.py | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini index ea13ba6c0ce..93796acf829 100644 --- 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 eca07f0f362..597ab788662 100644 --- 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 88826ce79f0..ac91234611d 100644 --- 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 950f951dd87..3f533fa3a34 100644 --- 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 = [