openstack/puppet-neutron
Code Issues Proposed changes

Deprecate mac_generation_retries option

Browse Source 
Change-Id: I81763b1d3cf742e051f022940e39f57e85675d49
This commit is contained in:
Mykyta Karpin 2017-01-12 16:40:59 +02:00
parent 1e779ba6f1
commit 06be04397c
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/init.pp
View File

@ -51,10 +51,6 @@
# (optional) The MAC address pattern to use. # (optional) The MAC address pattern to use.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*mac_generation_retries*]
# (optional) How many times to try to generate a unique mac
# Defaults to $::os_service_default
#
# [*dhcp_lease_duration*] # [*dhcp_lease_duration*]
# (optional) DHCP lease # (optional) DHCP lease
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -358,6 +354,10 @@
# [*memcache_servers*] # [*memcache_servers*]
# (optional) This option is deprecated an has no effect. # (optional) This option is deprecated an has no effect.
# #
# [*mac_generation_retries*]
# (optional) How many times to try to generate a unique mac
# Defaults to $::os_service_default
#
# [*rabbit_password*] # [*rabbit_password*]
# [*rabbit_host*] # [*rabbit_host*]
# [*rabbit_port*] # [*rabbit_port*]
@ -385,7 +385,6 @@ class neutron (
$service_plugins = $::os_service_default, $service_plugins = $::os_service_default,
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$base_mac = $::os_service_default, $base_mac = $::os_service_default,
$mac_generation_retries = $::os_service_default,
$dhcp_lease_duration = $::os_service_default, $dhcp_lease_duration = $::os_service_default,
$host = $::os_service_default, $host = $::os_service_default,
$dns_domain = $::os_service_default, $dns_domain = $::os_service_default,
@ -453,6 +452,7 @@ class neutron (
$allow_pagination = undef, $allow_pagination = undef,
$allow_sorting = undef, $allow_sorting = undef,
$memcache_servers = undef, $memcache_servers = undef,
$mac_generation_retries = $::os_service_default,
$rabbit_password = $::os_service_default, $rabbit_password = $::os_service_default,
$rabbit_host = $::os_service_default, $rabbit_host = $::os_service_default,
$rabbit_hosts = $::os_service_default, $rabbit_hosts = $::os_service_default,
@ -511,6 +511,10 @@ class neutron (
warning('memcache_servers option is deprecated, has no effect and will be removed after Ocata.') warning('memcache_servers option is deprecated, has no effect and will be removed after Ocata.')
} }
if ! is_service_default($mac_generation_retries) {
warning('mac_generation_retries option is deprecated, has no effect and will be removed after Ocata.')
}
if !is_service_default($rabbit_host) or if !is_service_default($rabbit_host) or
!is_service_default($rabbit_hosts) or !is_service_default($rabbit_hosts) or
!is_service_default($rabbit_password) or !is_service_default($rabbit_password) or
@ -538,7 +542,6 @@ deprecated. Please use neutron::default_transport_url instead.")
'DEFAULT/auth_strategy': value => $auth_strategy; 'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/core_plugin': value => $core_plugin; 'DEFAULT/core_plugin': value => $core_plugin;
'DEFAULT/base_mac': value => $base_mac; 'DEFAULT/base_mac': value => $base_mac;
'DEFAULT/mac_generation_retries': value => $mac_generation_retries;
'DEFAULT/dhcp_lease_duration': value => $dhcp_lease_duration; 'DEFAULT/dhcp_lease_duration': value => $dhcp_lease_duration;
'DEFAULT/host': value => $host; 'DEFAULT/host': value => $host;
'DEFAULT/dns_domain': value => $dns_domain; 'DEFAULT/dns_domain': value => $dns_domain;

4
releasenotes/notes/deprecate_mac_generation_retries-bad7545b4800d108.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- mac_generation_retries is deprecated, has no effect and
will be removed after Ocata cycle.

1
spec/classes/neutron_init_spec.rb
View File

@ -140,7 +140,6 @@ describe 'neutron' do
is_expected.to contain_neutron_config('DEFAULT/auth_strategy').with_value('keystone') is_expected.to contain_neutron_config('DEFAULT/auth_strategy').with_value('keystone')
is_expected.to contain_neutron_config('DEFAULT/core_plugin').with_value( params[:core_plugin] ) is_expected.to contain_neutron_config('DEFAULT/core_plugin').with_value( params[:core_plugin] )
is_expected.to contain_neutron_config('DEFAULT/base_mac').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_config('DEFAULT/base_mac').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/mac_generation_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/host').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_config('DEFAULT/host').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/dns_domain').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_config('DEFAULT/dns_domain').with_value('<SERVICE DEFAULT>')