From e953e3b5bfe1687dbc18b2cb124330b90b47f327 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 27 Sep 2024 11:03:16 +0900 Subject: [PATCH] Rename parameters for queue manager options ... to avoid potential collisions with default options. Change-Id: I16fd48aaa5ec5a693a510ee1598923f6c5129d71 --- manifests/init.pp | 18 +++++++++--------- spec/classes/aodh_init_spec.rb | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 82b0798c..1b250e5d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -102,15 +102,15 @@ # cancel and notify consumers when queue is down. # Defaults to $facts['os_service_default'] # -# [*use_queue_manager*] +# [*rabbit_use_queue_manager*] # (Optional) Should we use consistent queue names or random ones. # Defaults to $facts['os_service_default'] # -# [*hostname*] +# [*rabbit_hostname*] # (Optional) Hostname used by queue manager. # Defaults to $facts['os_service_default'] # -# [*processname*] +# [*rabbit_processname*] # (Optional) Process name used by queue manager. # Defaults to $facts['os_service_default'] # @@ -198,9 +198,9 @@ class aodh ( $rabbit_quorum_max_memory_length = $facts['os_service_default'], $rabbit_quorum_max_memory_bytes = $facts['os_service_default'], $rabbit_enable_cancel_on_failover = $facts['os_service_default'], - $use_queue_manager = $facts['os_service_default'], - $hostname = $facts['os_service_default'], - $processname = $facts['os_service_default'], + $rabbit_use_queue_manager = $facts['os_service_default'], + $rabbit_hostname = $facts['os_service_default'], + $rabbit_processname = $facts['os_service_default'], $rabbit_stream_fanout = $facts['os_service_default'], $kombu_ssl_ca_certs = $facts['os_service_default'], $kombu_ssl_certfile = $facts['os_service_default'], @@ -250,9 +250,9 @@ class aodh ( rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length, rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes, enable_cancel_on_failover => $rabbit_enable_cancel_on_failover, - use_queue_manager => $use_queue_manager, - hostname => $hostname, - processname => $processname, + use_queue_manager => $rabbit_use_queue_manager, + hostname => $rabbit_hostname, + processname => $rabbit_processname, rabbit_stream_fanout => $rabbit_stream_fanout, } diff --git a/spec/classes/aodh_init_spec.rb b/spec/classes/aodh_init_spec.rb index 73c882cd..3ed31082 100644 --- a/spec/classes/aodh_init_spec.rb +++ b/spec/classes/aodh_init_spec.rb @@ -101,9 +101,9 @@ describe 'aodh' do :rabbit_quorum_max_memory_length => 5, :rabbit_quorum_max_memory_bytes => 1073741824, :rabbit_enable_cancel_on_failover => false, - :use_queue_manager => false, - :hostname => 'node1.example.com', - :processname => 'procname', + :rabbit_use_queue_manager => false, + :rabbit_hostname => 'node1.example.com', + :rabbit_processname => 'procname', :rabbit_stream_fanout => false, :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :notification_driver => 'ceilometer.compute.aodh_notifier',