openstack
/
puppet-designate
Code Issues Proposed changes

Remove deprecated designate::neutron_network_type 

The parameter was deprecated during Yoga cycle in favor of the separate
class to manage network_api:neutron parameters[1].

[1] 09a2c6b46c

Change-Id: I31f52fcda46c33bf0163733aece4fd1279f63cc7
This commit is contained in:
Takashi Kajinami 2022-08-25 15:53:06 +09:00
parent 4f2583ebe1
commit 01e72cbb9a
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/init.pp
View File

@ -106,12 +106,6 @@
# (optional) Whether to use durable queues in AMQP. # (optional) Whether to use durable queues in AMQP.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# DEPRECATED PARAMETERS
#
# [*neutron_endpoint_type*]
# (optional) Endpoint type to use.
# Defaults to undef
#
class designate( class designate(
$package_ensure = present, $package_ensure = present,
$common_package_name = $::designate::params::common_package_name, $common_package_name = $::designate::params::common_package_name,
@ -134,17 +128,10 @@ class designate(
$notification_topics = 'notifications', $notification_topics = 'notifications',
$purge_config = false, $purge_config = false,
$amqp_durable_queues = $::os_service_default, $amqp_durable_queues = $::os_service_default,
# DEPRECATED PARAMETERS
$neutron_endpoint_type = undef
) inherits designate::params { ) inherits designate::params {
include designate::deps include designate::deps
if $neutron_endpoint_type != undef {
warning('The neutron_endpoint_type parameter is deprecated. Use the designate::network_api::neutron class.')
}
include designate::network_api::neutron
package { 'designate-common': package { 'designate-common':
ensure => $package_ensure, ensure => $package_ensure,
name => $common_package_name, name => $common_package_name,

4
manifests/network_api/neutron.pp
View File

@ -24,11 +24,9 @@ class designate::network_api::neutron (
include designate::deps include designate::deps
include designate::params include designate::params
$endpoint_type_real = pick($::designate::neutron_endpoint_type, $endpoint_type)
designate_config { designate_config {
'network_api:neutron/endpoints': value => join(any2array($endpoints), ','); 'network_api:neutron/endpoints': value => join(any2array($endpoints), ',');
'network_api:neutron/endpoint_type': value => $endpoint_type_real; 'network_api:neutron/endpoint_type': value => $endpoint_type;
'network_api:neutron/timeout': value => $timeout; 'network_api:neutron/timeout': value => $timeout;
} }

4
releasenotes/notes/remove-neutron_endpoint_type-c33cb824621b4db4.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``designate::neutron_endpoint_type`` parameter has been removed.

11
spec/classes/designate_init_spec.rb
View File

@ -7,10 +7,9 @@ describe 'designate' do
let :params do let :params do
{ {
:package_ensure => 'installed', :package_ensure => 'installed',
:purge_config => false, :purge_config => false,
:neutron_endpoint_type => 'internalURL', :root_helper => 'sudo designate-rootwrap /etc/designate/rootwrap.conf'
:root_helper => 'sudo designate-rootwrap /etc/designate/rootwrap.conf'
} }
end end
@ -70,10 +69,6 @@ describe 'designate' do
is_expected.to contain_designate_config('DEFAULT/root_helper').with_value( params[:root_helper] ) is_expected.to contain_designate_config('DEFAULT/root_helper').with_value( params[:root_helper] )
end end
it 'configures network endpoint type to use' do
is_expected.to contain_designate_config('network_api:neutron/endpoint_type').with_value( params[:neutron_endpoint_type] )
end
it 'configures messaging' do it 'configures messaging' do
is_expected.to contain_oslo__messaging__default('designate_config').with( is_expected.to contain_oslo__messaging__default('designate_config').with(
:transport_url => '<SERVICE DEFAULT>', :transport_url => '<SERVICE DEFAULT>',