diff --git a/examples/neutron.pp b/examples/neutron.pp index 925187743..1b90a8ce6 100644 --- a/examples/neutron.pp +++ b/examples/neutron.pp @@ -3,7 +3,6 @@ # General Neutron stuff # Configures everything in neutron.conf class { 'neutron': - allow_overlapping_ips => true, default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', service_plugins => ['metering'] } @@ -46,7 +45,6 @@ class { 'neutron::plugins::ml2': # Generally, any machine with a neutron element running on it talks # over Rabbit and needs to know if overlapping IPs (namespaces) are in use class { 'neutron': - allow_overlapping_ips => true, default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', } diff --git a/examples/neutron_l3_with_to_uuid.pp b/examples/neutron_l3_with_to_uuid.pp index 41a20492c..4be088c66 100644 --- a/examples/neutron_l3_with_to_uuid.pp +++ b/examples/neutron_l3_with_to_uuid.pp @@ -7,7 +7,6 @@ # class { 'neutron': - allow_overlapping_ips => true, default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', service_plugins => ['router'] } diff --git a/examples/neutron_with_pacemaker.pp b/examples/neutron_with_pacemaker.pp index 71d8672f7..e3b7c9df4 100644 --- a/examples/neutron_with_pacemaker.pp +++ b/examples/neutron_with_pacemaker.pp @@ -23,8 +23,7 @@ # sudo pcs constraint colocation add neutron_server_service with neutron_vip class { 'neutron': - allow_overlapping_ips => true, - service_plugins => [ 'dhcp', 'l3' ] + service_plugins => [ 'dhcp', 'l3' ] } class { 'neutron::server': diff --git a/examples/neutron_wsgi.pp b/examples/neutron_wsgi.pp index 6f8885335..cee00c24e 100644 --- a/examples/neutron_wsgi.pp +++ b/examples/neutron_wsgi.pp @@ -1,6 +1,5 @@ # Example of manifest to deploy Neutron API in WSGI with Apache class { 'neutron': - allow_overlapping_ips => true, default_transport_url => 'rabbit://guest:password@localhost:5672/neutron', } diff --git a/manifests/init.pp b/manifests/init.pp index 7712d9764..7e425a657 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -309,12 +309,6 @@ # (optional) Allow plugins that support it to create VLAN transparent networks # Defaults to $::os_service_default # -# DEPRECATED PARAMETERS -# -# [*allow_overlapping_ips*] -# (optional) Enables network namespaces -# Defaults to undef -# class neutron ( $enabled = true, $package_ensure = 'present', @@ -381,19 +375,11 @@ class neutron ( $notification_transport_url = $::os_service_default, $max_allowed_address_pair = $::os_service_default, $vlan_transparent = $::os_service_default, - # DEPRECATED PARAMETERS - $allow_overlapping_ips = undef, ) { include neutron::deps include neutron::params - if $allow_overlapping_ips != undef { - warning('The allow_overlapping_ips parameter is deprecated and \ -will be removed in a future release.') - } - $allow_overlapping_ips_real = pick($allow_overlapping_ips, $::os_service_default) - if ! is_service_default($use_ssl) and ($use_ssl) { if is_service_default($cert_file) { fail('The cert_file parameter is required when use_ssl is set to true') @@ -431,7 +417,6 @@ will be removed in a future release.') 'DEFAULT/dhcp_agents_per_network': value => $dhcp_agents_per_network; 'DEFAULT/dhcp_agent_notification': value => $dhcp_agent_notification; 'DEFAULT/allow_bulk': value => $allow_bulk; - 'DEFAULT/allow_overlapping_ips': value => $allow_overlapping_ips_real; 'DEFAULT/api_extensions_path': value => $api_extensions_path; 'DEFAULT/state_path': value => $state_path; 'DEFAULT/global_physnet_mtu': value => $global_physnet_mtu; diff --git a/releasenotes/notes/remove-allow_overlapping_ips-d3eecfb7ad9fd184.yaml b/releasenotes/notes/remove-allow_overlapping_ips-d3eecfb7ad9fd184.yaml new file mode 100644 index 000000000..5e4e312b2 --- /dev/null +++ b/releasenotes/notes/remove-allow_overlapping_ips-d3eecfb7ad9fd184.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``neutron::allow_overlapping_ips`` parameter has been removed. diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index b47d7f2aa..3feb8a80a 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -108,7 +108,6 @@ describe 'neutron' do should contain_neutron_config('DEFAULT/global_physnet_mtu').with_value('') should contain_neutron_config('DEFAULT/dhcp_agent_notification').with_value('') should contain_neutron_config('DEFAULT/allow_bulk').with_value('') - should contain_neutron_config('DEFAULT/allow_overlapping_ips').with_value('') should contain_neutron_config('DEFAULT/api_extensions_path').with_value('') should contain_neutron_config('DEFAULT/control_exchange').with_value('') should contain_neutron_config('DEFAULT/state_path').with_value('')