openstack/neutron
Code Issues Proposed changes

Deprecate "router_delete_namespaces" and "dhcp_delete_namespaces"

Browse Source 
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
This commit is contained in:
Anthony Chow 2015-06-23 22:05:23 -07:00
parent 98f39643ec
commit 830e911481
4 changed files with 14 additions and 2 deletions

3
etc/dhcp_agent.ini

@ -82,6 +82,9 @@
# Disable this if you hit the issue in # Disable this if you hit the issue in
# https://bugs.launchpad.net/neutron/+bug/1052535 or if # https://bugs.launchpad.net/neutron/+bug/1052535 or if
# you are sure that your version of iproute suffers from the problem. # 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 # dhcp_delete_namespaces = True
# Timeout for ovs-vsctl commands. # Timeout for ovs-vsctl commands.

3
etc/l3_agent.ini

@ -91,6 +91,9 @@
# https://bugs.launchpad.net/neutron/+bug/1052535 or if # https://bugs.launchpad.net/neutron/+bug/1052535 or if
# you are sure that your version of iproute suffers from the problem. # you are sure that your version of iproute suffers from the problem.
# If True, namespaces will be deleted when a router is destroyed. # 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 # router_delete_namespaces = True
# Timeout for ovs-vsctl commands. # Timeout for ovs-vsctl commands.

5
neutron/agent/dhcp/config.py

@ -50,7 +50,10 @@ DNSMASQ_OPTS = [
'used as forwarders.'), 'used as forwarders.'),
deprecated_name='dnsmasq_dns_server'), deprecated_name='dnsmasq_dns_server'),
cfg.BoolOpt('dhcp_delete_namespaces', default=True, 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( cfg.IntOpt(
'dnsmasq_lease_max', 'dnsmasq_lease_max',
default=(2 ** 24), default=(2 ** 24),

5
neutron/agent/l3/config.py

@ -77,7 +77,10 @@ OPTS = [
cfg.BoolOpt('enable_metadata_proxy', default=True, cfg.BoolOpt('enable_metadata_proxy', default=True,
help=_("Allow running metadata proxy.")), help=_("Allow running metadata proxy.")),
cfg.BoolOpt('router_delete_namespaces', default=True, 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', cfg.StrOpt('metadata_access_mark',
default='0x1', default='0x1',
help=_('Iptables mangle mark used to mark metadata valid ' help=_('Iptables mangle mark used to mark metadata valid '