From 1cdcbdff65ca76d6cbcf10b060f78b3efc76b78c Mon Sep 17 00:00:00 2001 From: Liam Young Date: Mon, 25 Sep 2023 09:48:55 +0000 Subject: [PATCH] Request quorum queues Update charm config to create rabbbitmq quorum queues. Change-Id: Ie2e4d05cb0865b47f74b61bdcdb5076d2b8e2dde --- charms/aodh-k8s/src/templates/aodh.conf.j2 | 2 ++ .../src/templates/parts/section-oslo-messaging-rabbit | 2 ++ charms/aodh-k8s/tests/bundles/smoke.yaml | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 charms/aodh-k8s/src/templates/parts/section-oslo-messaging-rabbit diff --git a/charms/aodh-k8s/src/templates/aodh.conf.j2 b/charms/aodh-k8s/src/templates/aodh.conf.j2 index a66848a7..9c079dae 100644 --- a/charms/aodh-k8s/src/templates/aodh.conf.j2 +++ b/charms/aodh-k8s/src/templates/aodh.conf.j2 @@ -18,3 +18,5 @@ alarm_histories_delete_batch_size = {{ options.alarm_histories_delete_batch_size {% include "parts/section-identity" %} {% include "parts/section-service-credentials" %} + +{% include "parts/section-oslo-messaging-rabbit" %} diff --git a/charms/aodh-k8s/src/templates/parts/section-oslo-messaging-rabbit b/charms/aodh-k8s/src/templates/parts/section-oslo-messaging-rabbit new file mode 100644 index 00000000..145c4ee9 --- /dev/null +++ b/charms/aodh-k8s/src/templates/parts/section-oslo-messaging-rabbit @@ -0,0 +1,2 @@ +[oslo_messaging_rabbit] +rabbit_quorum_queue = True diff --git a/charms/aodh-k8s/tests/bundles/smoke.yaml b/charms/aodh-k8s/tests/bundles/smoke.yaml index 5a114a16..5287a301 100644 --- a/charms/aodh-k8s/tests/bundles/smoke.yaml +++ b/charms/aodh-k8s/tests/bundles/smoke.yaml @@ -26,9 +26,11 @@ applications: # required for nova 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