From 5ebbf4aecc323bded2762611c9f2bda2ff374819 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Mon, 25 Sep 2023 09:49:03 +0000 Subject: [PATCH] Request quorum queues Update charm config to create rabbbitmq quorum queues. Change-Id: Ic2d328b993b2818b27170c11602dc0e27ad55d21 --- charms/nova-k8s/src/templates/nova.conf.j2 | 2 ++ .../src/templates/parts/section-oslo-messaging-rabbit | 2 ++ charms/nova-k8s/tests/bundles/smoke.yaml | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 charms/nova-k8s/src/templates/parts/section-oslo-messaging-rabbit diff --git a/charms/nova-k8s/src/templates/nova.conf.j2 b/charms/nova-k8s/src/templates/nova.conf.j2 index 78979fd8..8f49f109 100644 --- a/charms/nova-k8s/src/templates/nova.conf.j2 +++ b/charms/nova-k8s/src/templates/nova.conf.j2 @@ -54,3 +54,5 @@ workers = 4 [os_region_name] openstack = + +{% include "parts/section-oslo-messaging-rabbit" %} diff --git a/charms/nova-k8s/src/templates/parts/section-oslo-messaging-rabbit b/charms/nova-k8s/src/templates/parts/section-oslo-messaging-rabbit new file mode 100644 index 00000000..145c4ee9 --- /dev/null +++ b/charms/nova-k8s/src/templates/parts/section-oslo-messaging-rabbit @@ -0,0 +1,2 @@ +[oslo_messaging_rabbit] +rabbit_quorum_queue = True diff --git a/charms/nova-k8s/tests/bundles/smoke.yaml b/charms/nova-k8s/tests/bundles/smoke.yaml index 03225755..eb5aa60f 100644 --- a/charms/nova-k8s/tests/bundles/smoke.yaml +++ b/charms/nova-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