From 4fe9f39585a7d034a2dc724165e5c4239e0aabd2 Mon Sep 17 00:00:00 2001 From: Jorge Merlino Date: Mon, 29 Nov 2021 11:02:54 -0300 Subject: [PATCH] Fix transport_url with multiple rabbit servers When RabbitMQ is deployed in HA mode the transport_url parameter of masakari must reference all RabbitMQ instances. Previously it referenced only one. Now uses the configuration from the base OpenStack layer Closes-Bug: #1950331 Change-Id: Iea9d4f2484b82c22939a258e7f9faa3030a9bd1e --- src/templates/masakari.conf | 2 +- src/templates/stein/masakari.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/masakari.conf b/src/templates/masakari.conf index 4869687..4a0abfb 100644 --- a/src/templates/masakari.conf +++ b/src/templates/masakari.conf @@ -4,7 +4,7 @@ debug = {{ options.debug }} auth_strategy = keystone {% if amqp.password -%} -transport_url = rabbit://masakari:{{ amqp.password }}@{{ amqp.host }}:5672/masakari +{% include "parts/section-transport-url" %} {% endif -%} os_user_domain_name = {{ identity_service.service_domain }} diff --git a/src/templates/stein/masakari.conf b/src/templates/stein/masakari.conf index 07a7275..84f866a 100644 --- a/src/templates/stein/masakari.conf +++ b/src/templates/stein/masakari.conf @@ -5,7 +5,7 @@ auth_strategy = keystone notification_driver=taskflow_driver {% if amqp.password -%} -transport_url = rabbit://masakari:{{ amqp.password }}@{{ amqp.host }}:5672/masakari +{% include "parts/section-transport-url" %} {% endif -%} os_user_domain_name = {{ identity_service.service_domain }}