openstack/puppet-neutron
Code Issues Proposed changes

Unset deprecated parameter use_namespaces by default

Browse Source 
The option use_namespaces is deprecated and will be removed in a future release
The old behavior of use_namespaces = True will be enforced, hence setting it to
undef by default

Change-Id: I73ff929e40e6ed42247e6145202181067b6e28ed
This commit is contained in:
Sergey Kolekonov
2015-07-29 17:51:44 +03:00
parent 774470c8bb
commit 0a9eddaf02
8 changed files with 121 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/agents/dhcp.pp
View File

@@ -41,11 +41,6 @@
# Addresses bug: https://bugs.launchpad.net/neutron/+bug/1182616
# Note: This can safely be removed once the module only targets the Havana release.
#
# [*use_namespaces*]
# (optional) Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to true.
#
# [*dnsmasq_config_file*]
# (optional) Override the default dnsmasq settings with this file.
# Defaults to undef
@@ -69,6 +64,14 @@
# (optional) Use broadcast in DHCP replies
# Defaults to false.
#
# === Deprecated Parameters
#
# [*use_namespaces*]
# (optional) Deprecated. 'True' value will be enforced in future releases.
# Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to undef.
#
class neutron::agents::dhcp (
$package_ensure = present,
$enabled = true,
@@ -80,12 +83,13 @@ class neutron::agents::dhcp (
$dhcp_domain = 'openstacklocal',
$dhcp_driver = 'neutron.agent.linux.dhcp.Dnsmasq',
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$use_namespaces = true,
$dnsmasq_config_file = undef,
$dhcp_delete_namespaces = false,
$enable_isolated_metadata = false,
$enable_metadata_network = false,
$dhcp_broadcast_reply = false
$dhcp_broadcast_reply = false,
# DEPRECATED PARAMETERS
$use_namespaces = undef,
) {
include ::neutron::params
@@ -125,12 +129,18 @@ class neutron::agents::dhcp (
'DEFAULT/interface_driver': value => $interface_driver;
'DEFAULT/dhcp_domain': value => $dhcp_domain;
'DEFAULT/dhcp_driver': value => $dhcp_driver;
'DEFAULT/use_namespaces': value => $use_namespaces;
'DEFAULT/root_helper': value => $root_helper;
'DEFAULT/dhcp_delete_namespaces': value => $dhcp_delete_namespaces;
'DEFAULT/dhcp_broadcast_reply': value => $dhcp_broadcast_reply;
}
if $use_namespaces != undef {
warning('The use_namespaces parameter is deprecated and will be removed in future releases')
neutron_dhcp_agent_config {
'DEFAULT/use_namespaces': value => $use_namespaces;
}
}
if $dnsmasq_config_file {
neutron_dhcp_agent_config {
'DEFAULT/dnsmasq_config_file': value => $dnsmasq_config_file;

22
manifests/agents/l3.pp
View File

@@ -26,10 +26,6 @@
# (optional) The name of the external bridge
# Defaults to br-ex
#
# [*use_namespaces*]
# (optional) Enable overlapping IPs / network namespaces
# Defaults to false
#
# [*interface_driver*]
# (optional) Driver to interface with neutron
# Defaults to OVSInterfaceDriver
@@ -102,13 +98,20 @@
# [*allow_automatic_l3agent_failover*]
# DEPRECATED: Has no effect in this class. Use the same parameter in neutron::server instead.
#
# === Deprecated Parameters
#
# [*use_namespaces*]
# (optional) Deprecated. 'True' value will be enforced in future releases.
# Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to undef.
#
class neutron::agents::l3 (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$debug = false,
$external_network_bridge = 'br-ex',
$use_namespaces = true,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$router_id = undef,
$gateway_external_network_id = undef,
@@ -127,6 +130,7 @@ class neutron::agents::l3 (
$agent_mode = 'legacy',
# DEPRECATED PARAMETERS
$allow_automatic_l3agent_failover = false,
$use_namespaces = undef,
) {
include ::neutron::params
@@ -149,7 +153,6 @@ class neutron::agents::l3 (
neutron_l3_agent_config {
'DEFAULT/debug': value => $debug;
'DEFAULT/external_network_bridge': value => $external_network_bridge;
'DEFAULT/use_namespaces': value => $use_namespaces;
'DEFAULT/interface_driver': value => $interface_driver;
'DEFAULT/router_id': value => $router_id;
'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id;
@@ -163,6 +166,13 @@ class neutron::agents::l3 (
'DEFAULT/agent_mode': value => $agent_mode;
}
if $use_namespaces != undef {
warning('The use_namespaces parameter is deprecated and will be removed in future releases')
neutron_l3_agent_config {
'DEFAULT/use_namespaces': value => $use_namespaces;
}
}
if $network_device_mtu {
warning('The neutron::agents::l3::network_device_mtu parameter is deprecated, use neutron::network_device_mtu instead.')
neutron_l3_agent_config {

24
manifests/agents/lbaas.pp
View File

@@ -23,11 +23,6 @@
# [*device_driver*]
# (optional) Defaults to 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver'.
#
# [*use_namespaces*]
# (optional) Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to true.
#
# [*user_group*]
# (optional) The user group.
# Defaults to $::neutron::params::nobody_user_group
@@ -37,6 +32,14 @@
# Disable this if you are using the puppetlabs-haproxy module
# Defaults to true
#
# === Deprecated Parameters
#
# [*use_namespaces*]
# (optional) Deprecated. 'True' value will be enforced in future releases.
# Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to undef.
#
class neutron::agents::lbaas (
$package_ensure = present,
$enabled = true,
@@ -44,9 +47,10 @@ class neutron::agents::lbaas (
$debug = false,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$device_driver = 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
$use_namespaces = true,
$user_group = $::neutron::params::nobody_user_group,
$manage_haproxy_package = true,
# DEPRECATED PARAMETERS
$use_namespaces = undef,
) {
include ::neutron::params
@@ -73,10 +77,16 @@ class neutron::agents::lbaas (
'DEFAULT/debug': value => $debug;
'DEFAULT/interface_driver': value => $interface_driver;
'DEFAULT/device_driver': value => $device_driver;
'DEFAULT/use_namespaces': value => $use_namespaces;
'haproxy/user_group': value => $user_group;
}
if $use_namespaces != undef {
warning('The use_namespaces parameter is deprecated and will be removed in future releases')
neutron_lbaas_agent_config {
'DEFAULT/use_namespaces': value => $use_namespaces;
}
}
Package['neutron'] -> Package['neutron-lbaas-agent']
Package['neutron-lbaas-agent'] -> Neutron_config<||>
Package['neutron-lbaas-agent'] -> Neutron_lbaas_agent_config<||>

26
manifests/agents/metering.pp
View File

@@ -37,11 +37,6 @@
# [*interface_driver*]
# (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
#
# [*use_namespaces*]
# (optional) Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to true.
#
# [*measure_interval*]
# (optional) Interval between two metering measures.
# Defaults to 30.
@@ -50,6 +45,14 @@
# (optional) Interval between two metering reports.
# Defaults to 300.
#
# === Deprecated Parameters
#
# [*use_namespaces*]
# (optional) Deprecated. 'True' value will be enforced in future releases.
# Allow overlapping IP (Must have kernel build with
# CONFIG_NET_NS=y and iproute2 package that supports namespaces).
# Defaults to undef.
#
class neutron::agents::metering (
$package_ensure = present,
@@ -57,9 +60,10 @@ class neutron::agents::metering (
$manage_service = true,
$debug = false,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$use_namespaces = true,
$measure_interval = '30',
$report_interval = '300'
$report_interval = '300',
# DEPRECATED PARAMETERS
$use_namespaces = undef,
) {
include ::neutron::params
@@ -73,11 +77,17 @@ class neutron::agents::metering (
neutron_metering_agent_config {
'DEFAULT/debug': value => $debug;
'DEFAULT/interface_driver': value => $interface_driver;
'DEFAULT/use_namespaces': value => $use_namespaces;
'DEFAULT/measure_interval': value => $measure_interval;
'DEFAULT/report_interval': value => $report_interval;
}
if $use_namespaces != undef {
warning('The use_namespaces parameter is deprecated and will be removed in future releases')
neutron_metering_agent_config {
'DEFAULT/use_namespaces': value => $use_namespaces;
}
}
if $::neutron::params::metering_agent_package {
Package['neutron'] -> Package['neutron-metering-agent']
Package['neutron-metering-agent'] -> Neutron_config<||>

12
spec/classes/neutron_agents_dhcp_spec.rb
View File

@@ -20,7 +20,7 @@ describe 'neutron::agents::dhcp' do
:dhcp_domain => 'openstacklocal',
:dhcp_driver => 'neutron.agent.linux.dhcp.Dnsmasq',
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:use_namespaces => true,
:use_namespaces => nil,
:dnsmasq_config_file => nil,
:dhcp_delete_namespaces => false,
:enable_isolated_metadata => false,
@@ -51,7 +51,6 @@ describe 'neutron::agents::dhcp' do
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_domain').with_value(p[:dhcp_domain]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value(p[:dhcp_driver]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/root_helper').with_value(p[:root_helper]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_delete_namespaces').with_value(p[:dhcp_delete_namespaces]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_isolated_metadata').with_value(p[:enable_isolated_metadata]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_metadata_network').with_value(p[:enable_metadata_network]);
@@ -119,6 +118,15 @@ describe 'neutron::agents::dhcp' do
it_raises 'a Puppet::Error', /enable_metadata_network to true requires enable_isolated_metadata also enabled./
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
end
shared_examples_for 'neutron dhcp agent with dnsmasq_config_file specified' do

12
spec/classes/neutron_agents_l3_spec.rb
View File

@@ -11,7 +11,7 @@ describe 'neutron::agents::l3' do
:enabled => true,
:debug => false,
:external_network_bridge => 'br-ex',
:use_namespaces => true,
:use_namespaces => nil,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:router_id => nil,
:gateway_external_network_id => nil,
@@ -50,7 +50,6 @@ describe 'neutron::agents::l3' do
it 'configures l3_agent.ini' do
is_expected.to contain_neutron_l3_agent_config('DEFAULT/debug').with_value(p[:debug])
is_expected.to contain_neutron_l3_agent_config('DEFAULT/external_network_bridge').with_value(p[:external_network_bridge])
is_expected.to contain_neutron_l3_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
is_expected.to contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver])
is_expected.to contain_neutron_l3_agent_config('DEFAULT/router_id').with_value(p[:router_id])
is_expected.to contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value(p[:gateway_external_network_id])
@@ -117,6 +116,15 @@ describe 'neutron::agents::l3' do
is_expected.to contain_neutron_l3_agent_config('DEFAULT/ha_vrrp_advert_int').with_value(p[:ha_vrrp_advert_int])
end
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_l3_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
end
shared_examples_for 'neutron l3 agent with network_device_mtu specified' do

12
spec/classes/neutron_agents_lbaas_spec.rb
View File

@@ -16,7 +16,7 @@ describe 'neutron::agents::lbaas' do
:debug => false,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:device_driver => 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
:use_namespaces => true,
:use_namespaces => nil,
:manage_haproxy_package => true
}
end
@@ -42,7 +42,6 @@ describe 'neutron::agents::lbaas' do
is_expected.to contain_neutron_lbaas_agent_config('DEFAULT/debug').with_value(p[:debug]);
is_expected.to contain_neutron_lbaas_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
is_expected.to contain_neutron_lbaas_agent_config('DEFAULT/device_driver').with_value(p[:device_driver]);
is_expected.to contain_neutron_lbaas_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces]);
is_expected.to contain_neutron_lbaas_agent_config('haproxy/user_group').with_value(platform_params[:nobody_user_group]);
end
@@ -75,6 +74,15 @@ describe 'neutron::agents::lbaas' do
is_expected.to contain_service('neutron-lbaas-service').without_ensure
end
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_lbaas_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
end
shared_examples_for 'haproxy lbaas_driver' do

12
spec/classes/neutron_agents_metering_spec.rb
View File

@@ -37,7 +37,7 @@ describe 'neutron::agents::metering' do
:enabled => true,
:debug => false,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:use_namespaces => true,
:use_namespaces => nil,
:measure_interval => '30',
:report_interval => '300'
}
@@ -59,7 +59,6 @@ describe 'neutron::agents::metering' do
it 'configures metering_agent.ini' do
is_expected.to contain_neutron_metering_agent_config('DEFAULT/debug').with_value(p[:debug]);
is_expected.to contain_neutron_metering_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
is_expected.to contain_neutron_metering_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces]);
is_expected.to contain_neutron_metering_agent_config('DEFAULT/measure_interval').with_value(p[:measure_interval]);
is_expected.to contain_neutron_metering_agent_config('DEFAULT/report_interval').with_value(p[:report_interval]);
end
@@ -97,6 +96,15 @@ describe 'neutron::agents::metering' do
is_expected.to contain_service('neutron-metering-service').without_ensure
end
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_metering_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
end
context 'on Debian platforms' do