openstack/puppet-neutron
Code Issues Proposed changes

Remove network_device_mtu

Browse Source 
network_device_mtu was deprecated in mitaka  and has now been completely
removed from neutron for newton. This patch removes all references.

Depends-On: I4092a2f75691a0030f7ca4d18da3bfd7aeac1adc
Change-Id: I1cdeb9012a41a7232aaebe9407408dd8dc2a5f45
This commit is contained in:
Brent Eagles 2016-07-29 14:48:33 -02:30
parent 8a85bb0860
commit 610de6e98d
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

@ -361,8 +361,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*network_device_mtu*]
#
# [*verbose*] # [*verbose*]
# (optional) Deprecated. Verbose logging # (optional) Deprecated. Verbose logging
# Defaults to undef # Defaults to undef
@ -456,7 +454,6 @@ class neutron (
$notification_topics = $::os_service_default, $notification_topics = $::os_service_default,
$notification_transport_url = $::os_service_default, $notification_transport_url = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$network_device_mtu = undef,
$verbose = undef, $verbose = undef,
$log_facility = undef, $log_facility = undef,
$advertise_mtu = undef, $advertise_mtu = undef,
@ -534,7 +531,7 @@ class neutron (
'DEFAULT/allow_overlapping_ips': value => $allow_overlapping_ips; 'DEFAULT/allow_overlapping_ips': value => $allow_overlapping_ips;
'DEFAULT/api_extensions_path': value => $api_extensions_path; 'DEFAULT/api_extensions_path': value => $api_extensions_path;
'DEFAULT/state_path': value => $state_path; 'DEFAULT/state_path': value => $state_path;
'DEFAULT/global_physnet_mtu': value => pick($network_device_mtu, $global_physnet_mtu); 'DEFAULT/global_physnet_mtu': value => $global_physnet_mtu;
'agent/root_helper': value => $root_helper; 'agent/root_helper': value => $root_helper;
'agent/root_helper_daemon': value => $root_helper_daemon; 'agent/root_helper_daemon': value => $root_helper_daemon;
'agent/report_interval': value => $report_interval; 'agent/report_interval': value => $report_interval;
@ -624,10 +621,6 @@ class neutron (
} }
} }
if $network_device_mtu {
warning('The neutron::network_device_mtu parameter is deprecated, use neutron::global_physnet_mtu instead.')
}
# SSL Options # SSL Options
neutron_config { neutron_config {
'DEFAULT/use_ssl': value => $use_ssl; 'DEFAULT/use_ssl': value => $use_ssl;

1
releasenotes/notes/newton_remove_deprecated_options-772c33dec894edb1.yaml
View File

@ -9,3 +9,4 @@ other:
* allow_automatic_l3agent_failover from l3 agent * allow_automatic_l3agent_failover from l3 agent
* network_device_mtu from l3 agent * network_device_mtu from l3 agent
* auth_password, auth_tenant, auth_user, auth_url, auth_insecure, auth_region from metadata agent * auth_password, auth_tenant, auth_user, auth_url, auth_insecure, auth_region from metadata agent
- Remove all other references to network_device_mtu

12
spec/classes/neutron_init_spec.rb
View File

@ -441,18 +441,6 @@ describe 'neutron' do
end end
end end
shared_examples_for 'with deprecated network_device_mtu defined' do
before do
params.merge!(
:network_device_mtu => 9000
)
end
it do
is_expected.to contain_neutron_config('DEFAULT/global_physnet_mtu').with_value(params[:network_device_mtu])
end
end
shared_examples_for 'with host defined' do shared_examples_for 'with host defined' do
before do before do
params.merge!( params.merge!(