From 269ba2bb1d48ea515b315a9a7226dc010784ccaa Mon Sep 17 00:00:00 2001 From: Dmitrii Shcherbakov Date: Mon, 5 Feb 2018 14:22:54 +0300 Subject: [PATCH] reintroduce designate_notifications topic Change I709a6aca1843918a67d43bc4808a0013168fbc55, commit hash 1879b16ea543b076c9555fdc0258355d39af9ad0 introduced a backwards-incompatible change in the fact that designate stopped consuming messages using designate_notifications topic from nova and neutron. While designate.conf change in the mentioned commit is needed to make sure Designate emits its own notifications on the topic that ceilometer uses ("notifications"), for nova and neutron to designate notifications a separate topic should be used as before. A revert of the previous commit is not done as it addresses the previous issue but introduces a new one. Change-Id: I6b5fd1b5f9bae1cd4a1683fd476b456e81d6c79e Related-Bug: #1710831 --- src/templates/mitaka/nova_sink.cfg | 1 + src/templates/newton/nova_sink.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/src/templates/mitaka/nova_sink.cfg b/src/templates/mitaka/nova_sink.cfg index 4b35c02..3d6d39d 100644 --- a/src/templates/mitaka/nova_sink.cfg +++ b/src/templates/mitaka/nova_sink.cfg @@ -1,6 +1,7 @@ {% if options.nova_domain_id %} [handler:nova_fixed] zone_id = {{ options.nova_domain_id }} +notification_topics = 'notifications_designate' control_exchange = 'nova' format = '{{ options.nova_record_format }}' {% endif %} diff --git a/src/templates/newton/nova_sink.cfg b/src/templates/newton/nova_sink.cfg index be4f89d..fa1f231 100644 --- a/src/templates/newton/nova_sink.cfg +++ b/src/templates/newton/nova_sink.cfg @@ -1,6 +1,7 @@ {% if options.nova_domain_id %} [handler:nova_fixed] zone_id = {{ options.nova_domain_id }} +notification_topics = 'notifications_designate' control_exchange = 'nova' formatv4 = '{{ options.nova_record_format }}' formatv6 = '{{ options.nova_record_formatv6 }}'