From 68134d713aac272ad453ee38d0807e67687c8177 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Mon, 25 Sep 2023 09:49:02 +0000
Subject: [PATCH] Request quorum queues

Update charm config to create rabbbitmq quorum queues.

Change-Id: I373a9ceb6eb0b532d16d3e23f1a9f75df26a3400
---
 charms/glance-k8s/src/templates/glance-api.conf.j2            | 3 +++
 .../src/templates/parts/section-oslo-messaging-rabbit         | 2 ++
 charms/glance-k8s/tests/bundles/smoke.yaml                    | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 charms/glance-k8s/src/templates/parts/section-oslo-messaging-rabbit

diff --git a/charms/glance-k8s/src/templates/glance-api.conf.j2 b/charms/glance-k8s/src/templates/glance-api.conf.j2
index 57da88c0..e05c5e36 100644
--- a/charms/glance-k8s/src/templates/glance-api.conf.j2
+++ b/charms/glance-k8s/src/templates/glance-api.conf.j2
@@ -45,3 +45,6 @@ rbd_store_ceph_conf = /etc/ceph/ceph.conf
 
 [paste_deploy]
 flavor = keystone
+
+{% include "parts/section-oslo-messaging-rabbit" %}
+
diff --git a/charms/glance-k8s/src/templates/parts/section-oslo-messaging-rabbit b/charms/glance-k8s/src/templates/parts/section-oslo-messaging-rabbit
new file mode 100644
index 00000000..145c4ee9
--- /dev/null
+++ b/charms/glance-k8s/src/templates/parts/section-oslo-messaging-rabbit
@@ -0,0 +1,2 @@
+[oslo_messaging_rabbit]
+rabbit_quorum_queue = True
diff --git a/charms/glance-k8s/tests/bundles/smoke.yaml b/charms/glance-k8s/tests/bundles/smoke.yaml
index 6cb806e7..83771aec 100644
--- a/charms/glance-k8s/tests/bundles/smoke.yaml
+++ b/charms/glance-k8s/tests/bundles/smoke.yaml
@@ -26,9 +26,11 @@ applications:
   # required for glance
   rabbitmq:
     charm: ch:rabbitmq-k8s
-    channel: 3.9/edge
+    channel: 3.12/edge
     scale: 1
     trust: true
+    options:
+      minimum-replicas: 1
 
   keystone:
     charm: ch:keystone-k8s