Delete namespaces by default

Namespace deletion was disabled in upstream because of iproute issue.
This issue was solved by 3.12.0 iproute release back in 2013. Neutron
now by default deletes namespaces, so should we.

Change-Id: Ic125df7876ad69ec662ced66869c65f7df868c7e
This commit is contained in:
Lukas Bezdicka
2015-10-16 12:23:38 +02:00
committed by Lukas Bezdicka
parent 46a84300df
commit 4408e648f4
4 changed files with 6 additions and 6 deletions

View File

@@ -47,7 +47,7 @@
#
# [*dhcp_delete_namespaces*]
# (optional) Delete namespace after removing a dhcp server
# Defaults to false.
# Defaults to true.
#
# [*enable_isolated_metadata*]
# (optional) enable metadata support on isolated networks.
@@ -84,7 +84,7 @@ class neutron::agents::dhcp (
$dhcp_driver = 'neutron.agent.linux.dhcp.Dnsmasq',
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$dnsmasq_config_file = undef,
$dhcp_delete_namespaces = false,
$dhcp_delete_namespaces = true,
$enable_isolated_metadata = false,
$enable_metadata_network = false,
$dhcp_broadcast_reply = false,

View File

@@ -70,7 +70,7 @@
#
# [*router_delete_namespaces*]
# (optional) namespaces can be deleted cleanly on the host running the L3 agent
# Defaults to False
# Defaults to true
#
# [*ha_enabled*]
# (optional) Enabled or not HA for L3 agent.
@@ -122,7 +122,7 @@ class neutron::agents::l3 (
$periodic_fuzzy_delay = '5',
$enable_metadata_proxy = true,
$network_device_mtu = undef,
$router_delete_namespaces = false,
$router_delete_namespaces = true,
$ha_enabled = false,
$ha_vrrp_auth_type = 'PASS',
$ha_vrrp_auth_password = undef,

View File

@@ -22,7 +22,7 @@ describe 'neutron::agents::dhcp' do
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:use_namespaces => nil,
:dnsmasq_config_file => nil,
:dhcp_delete_namespaces => false,
:dhcp_delete_namespaces => true,
:enable_isolated_metadata => false,
:enable_metadata_network => false,
:dhcp_broadcast_reply => false }

View File

@@ -22,7 +22,7 @@ describe 'neutron::agents::l3' do
:periodic_fuzzy_delay => '5',
:enable_metadata_proxy => true,
:network_device_mtu => nil,
:router_delete_namespaces => false,
:router_delete_namespaces => true,
:ha_enabled => false,
:ha_vrrp_auth_type => 'PASS',
:ha_vrrp_auth_password => nil,