Merge pull request #739 from lmiccini/quorum2

openshift-merge-bot[bot] · web-flow · commit b0bbbd37131d · 2025-08-26T11:48:59.000Z
Use quorum queues if enabled
diff --git a/controllers/autoscaling_controller.go b/controllers/autoscaling_controller.go
@@ -682,6 +682,9 @@ func (r *AutoscalingReconciler) generateServiceConfig(
 		templateParameters["MemcachedAuthCa"] = fmt.Sprint(memcachedv1.CaMountPath())
 	}
 
+	// Quorum Queues
+	templateParameters["QuorumQueues"] = string(transportURLSecret.Data["quorumqueues"]) == "true"
+
 	cms := []util.Template{
 		// ScriptsSecret
 		{
diff --git a/controllers/ceilometer_controller.go b/controllers/ceilometer_controller.go
@@ -1237,6 +1237,9 @@ func (r *CeilometerReconciler) generateServiceConfig(
 	}
 	templateParameters["vhost"] = endptConfig
 
+	// Quorum Queues
+	templateParameters["QuorumQueues"] = string(transportURLSecret.Data["quorumqueues"]) == "true"
+
 	// If the Swift user exists, we add it to the polling
 	if r.roleExists(ctx, h, instance, "SwiftSystemReader", h.GetLogger()) {
 		templateParameters["SwiftRole"] = true
diff --git a/templates/autoscaling/config/aodh.conf b/templates/autoscaling/config/aodh.conf
@@ -27,6 +27,12 @@ policy_file=/etc/aodh/policy.yaml
 [oslo_messaging_notifications]
 driver=noop
 transport_url = {{ .TransportURL }}
+{{ if (index . "QuorumQueues") }}
+[oslo_messaging_rabbit]
+rabbit_quorum_queue=true
+rabbit_transient_quorum_queue=true
+amqp_durable_queues=true
+{{- end }}
 
 [keystone_authtoken]
 www_authenticate_uri = {{ .KeystoneInternalURL }}
diff --git a/templates/ceilometercentral/config/ceilometer.conf b/templates/ceilometercentral/config/ceilometer.conf
@@ -40,6 +40,12 @@ notify_address_prefix=
 driver=messagingv2
 topics=notifications
 transport_url={{ .TransportURL }}
+{{ if (index . "QuorumQueues") }}
+[oslo_messaging_rabbit]
+rabbit_quorum_queue=true
+rabbit_transient_quorum_queue=true
+amqp_durable_queues=true
+{{- end }}
 
 [polling]
 heartbeat_socket_dir=/var/lib/ceilometer

Original file line number	Diff line number	Diff line change
`@@ -682,6 +682,9 @@ func (r *AutoscalingReconciler) generateServiceConfig(`
`682`	`682`	`templateParameters["MemcachedAuthCa"] = fmt.Sprint(memcachedv1.CaMountPath())`
`683`	`683`	`}`
`684`	`684`
	`685`	`+ // Quorum Queues`
	`686`	`+ templateParameters["QuorumQueues"] = string(transportURLSecret.Data["quorumqueues"]) == "true"`
	`687`	`+`
`685`	`688`	`cms := []util.Template{`
`686`	`689`	`// ScriptsSecret`
`687`	`690`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1237,6 +1237,9 @@ func (r *CeilometerReconciler) generateServiceConfig(`
`1237`	`1237`	`}`
`1238`	`1238`	`templateParameters["vhost"] = endptConfig`
`1239`	`1239`
	`1240`	`+ // Quorum Queues`
	`1241`	`+ templateParameters["QuorumQueues"] = string(transportURLSecret.Data["quorumqueues"]) == "true"`
	`1242`	`+`
`1240`	`1243`	`// If the Swift user exists, we add it to the polling`
`1241`	`1244`	`if r.roleExists(ctx, h, instance, "SwiftSystemReader", h.GetLogger()) {`
`1242`	`1245`	`templateParameters["SwiftRole"] = true`