openstack
/
puppet-designate
Code Issues Proposed changes

Remove redundant hard-coded defaults of oslo.messaging parameters 

These define same values as the default values in the oslo.messaging
library, thus can be replaced by $::os_service_default.

Change-Id: I7da6736c7a47ebdc988bc8e0d7274cba873f72c6
This commit is contained in:
Takashi Kajinami 2022-08-28 23:38:59 +09:00
parent 406a78f867
commit 91a6bd2a6f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@ -43,7 +43,7 @@
#
# [*rabbit_use_ssl*]
# (optional) Connect over SSL for RabbitMQ
# Defaults to false
# Defaults to $::os_service_default
#
# [*rabbit_ha_queues*]
# (optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this
@ -95,7 +95,7 @@
#
# [*notification_topics*]
# (optional) Notification Topics
# Defaults to 'notifications'
# Defaults to $::os_service_default
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -118,7 +118,7 @@ class designate(
$root_helper = 'sudo designate-rootwrap /etc/designate/rootwrap.conf',
$state_path = $::designate::params::state_path,
$notification_transport_url = $::os_service_default,
$rabbit_use_ssl = false,
$rabbit_use_ssl = $::os_service_default,
$rabbit_ha_queues = $::os_service_default,
$rabbit_heartbeat_in_pthread = $::os_service_default,
$kombu_ssl_ca_certs = $::os_service_default,
@ -131,7 +131,7 @@ class designate(
$default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$control_exchange = $::os_service_default,
$notification_topics = 'notifications',
$notification_topics = $::os_service_default,
$purge_config = false,
$amqp_durable_queues = $::os_service_default,
# DEPRECATED PARAMETERS

4
spec/classes/designate_init_spec.rb
View File

@ -83,7 +83,7 @@ describe 'designate' do
is_expected.to contain_oslo__messaging__notifications('designate_config').with(
:driver => 'messaging',
:transport_url => '<SERVICE DEFAULT>',
:topics => 'notifications'
:topics => '<SERVICE DEFAULT>'
)
is_expected.to contain_oslo__messaging__rabbit('designate_config').with(
:kombu_ssl_version => '<SERVICE DEFAULT>',
@ -92,7 +92,7 @@ describe 'designate' do
:kombu_ssl_ca_certs => '<SERVICE DEFAULT>',
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
:kombu_failover_strategy => '<SERVICE DEFAULT>',
:rabbit_use_ssl => false,
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:rabbit_ha_queues => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => '<SERVICE DEFAULT>',
:amqp_durable_queues => '<SERVICE DEFAULT>',