From ebb199a55ca0bb310d6cb14165399785a96fa76d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 23 Jul 2023 00:10:14 +0900
Subject: [PATCH] Do not hard-code [oslo_messaging_amqp] container_name

The container name should be globally unique, and using a fixed and
hard-coded value does not meet that requirement.

The oslo.messaging library generates the random value automatically
unless the option is set, so we should rely on that behavior.

Change-Id: Id021d0581894fea76359a7d1d41117b27bfa7376
---
 manifests/init.pp                                           | 2 +-
 .../amqp_container_name-use_default-2ea9e17fcb213273.yaml   | 6 ++++++
 spec/classes/manila_init_spec.rb                            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/amqp_container_name-use_default-2ea9e17fcb213273.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 21d1f2c2..70d16f73 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -234,7 +234,7 @@ class manila (
   $amqp_server_request_prefix  = $facts['os_service_default'],
   $amqp_broadcast_prefix       = $facts['os_service_default'],
   $amqp_group_request_prefix   = $facts['os_service_default'],
-  $amqp_container_name         = 'guest',
+  $amqp_container_name         = $facts['os_service_default'],
   $amqp_idle_timeout           = $facts['os_service_default'],
   $amqp_trace                  = $facts['os_service_default'],
   $amqp_ssl_ca_file            = $facts['os_service_default'],
diff --git a/releasenotes/notes/amqp_container_name-use_default-2ea9e17fcb213273.yaml b/releasenotes/notes/amqp_container_name-use_default-2ea9e17fcb213273.yaml
new file mode 100644
index 00000000..11bbe5b0
--- /dev/null
+++ b/releasenotes/notes/amqp_container_name-use_default-2ea9e17fcb213273.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    The default value of ``manila::amqp_container_name`` has been updated and
+    now the service default value is used by default, so that a unique value
+    is generated by the `oslo.meesaging` library.
diff --git a/spec/classes/manila_init_spec.rb b/spec/classes/manila_init_spec.rb
index f454bab4..5370a2c2 100644
--- a/spec/classes/manila_init_spec.rb
+++ b/spec/classes/manila_init_spec.rb
@@ -213,7 +213,7 @@ describe 'manila' do
           :server_request_prefix => '<SERVICE DEFAULT>',
           :broadcast_prefix      => '<SERVICE DEFAULT>',
           :group_request_prefix  => '<SERVICE DEFAULT>',
-          :container_name        => 'guest',
+          :container_name        => '<SERVICE DEFAULT>',
           :idle_timeout          => '<SERVICE DEFAULT>',
           :trace                 => '<SERVICE DEFAULT>',
           :ssl_ca_file           => '<SERVICE DEFAULT>',