From 3fc2e641e380d18ac41a54a9148d0d20ba689532 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <noonedeadpunk@ya.ru>
Date: Tue, 20 Apr 2021 20:57:27 +0300
Subject: [PATCH] Fix oslo_messaging topic condition

oslo_messaging_notifications topics have invalid conditions and rely on
the neutron variables

Change-Id: I0ebd14c79836cfbf43127c6642dfea5d426f4b8d
---
 templates/zun.conf.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/zun.conf.j2 b/templates/zun.conf.j2
index 88f95d0..8f6233b 100644
--- a/templates/zun.conf.j2
+++ b/templates/zun.conf.j2
@@ -86,10 +86,10 @@ driver = {{ (zun_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }}
 transport_url = {{ zun_oslomsg_notify_transport }}://{% for host in zun_oslomsg_notify_servers.split(',') %}{{ zun_oslomsg_notify_userid }}:{{ zun_oslomsg_notify_password }}@{{ host }}:{{ zun_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ zun_oslomsg_notify_vhost }}{% if (zun_oslomsg_notify_use_ssl | lower) | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 {% if zun_ceilometer_enabled or zun_designate_enabled %}
 {% set notification_topics = [] %}
-{% if neutron_ceilometer_enabled %}
+{% if zun_ceilometer_enabled %}
 {%   set _ = notification_topics.append('notifications') %}
 {% endif %}
-{% if neutron_designate_enabled %}
+{% if zun_designate_enabled %}
 {%   set _ = notification_topics.append(zun_notifications_designate) %}
 {% endif %}
 topics = {{ notification_topics | join(',') }}