From 3c31dcded7422cdcd9874a246b98a31e303c620f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 28 Sep 2024 01:04:38 +0900 Subject: [PATCH] Drop redundant hard-coded default of notification topics The current value exactly matches the service default value. Change-Id: Ia598e4ebcb078b99c417e7bb578359f730138127 --- manifests/init.pp | 4 ++-- spec/classes/ceilometer_init_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 2d66cbbd..ea73342d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,7 +25,7 @@ # # [*notification_topics*] # (Optional) AMQP topic used for OpenStack notifications (list value) -# Defaults to 'notifications'. +# Defaults to $facts['os_service_default'] # # [*notification_driver*] # (optional) Driver or drivers to handle sending notifications. @@ -177,7 +177,7 @@ class ceilometer( $http_timeout = $facts['os_service_default'], $max_parallel_requests = $facts['os_service_default'], $notification_transport_url = $facts['os_service_default'], - $notification_topics = ['notifications'], + $notification_topics = $facts['os_service_default'], $notification_driver = $facts['os_service_default'], $notification_retry = $facts['os_service_default'], $package_ensure = 'present', diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb index c38e895f..ef45ff5e 100644 --- a/spec/classes/ceilometer_init_spec.rb +++ b/spec/classes/ceilometer_init_spec.rb @@ -89,7 +89,7 @@ describe 'ceilometer' do is_expected.to contain_oslo__messaging__notifications('ceilometer_config').with( :transport_url => '', :driver => '', - :topics => ['notifications'], + :topics => '', :retry => '', ) end