From 1879b16ea543b076c9555fdc0258355d39af9ad0 Mon Sep 17 00:00:00 2001
From: Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>
Date: Fri, 17 Nov 2017 14:59:50 +0300
Subject: [PATCH] drop notifications_designate, add missing section

A separate topic has been used for nova, neutron -> designate. Let's use
a single one instead.

Change-Id: I709a6aca1843918a67d43bc4808a0013168fbc55
Closes-Bug: #1710831
---
 src/templates/mitaka/designate.conf | 11 -----------
 src/templates/mitaka/nova_sink.cfg  |  1 -
 2 files changed, 12 deletions(-)

diff --git a/src/templates/mitaka/designate.conf b/src/templates/mitaka/designate.conf
index 2aeb57d..006d518 100644
--- a/src/templates/mitaka/designate.conf
+++ b/src/templates/mitaka/designate.conf
@@ -20,12 +20,6 @@ debug = {{ options.debug }}
 # Log directory
 #logdir = /var/log/designate
 
-# Driver used for issuing notifications
-notification_driver = messaging
-
-# Notification Topics
-notification_topics = notifications_designate
-
 # Use "sudo designate-rootwrap /etc/designate/rootwrap.conf" to use the real
 # root filter facility.
 # Change to "sudo" to skip the filtering and just run the comand directly
@@ -38,11 +32,6 @@ notification_topics = notifications_designate
 # RabbitMQ Config
 #-----------------------
 {% include "parts/section-rabbitmq-oslo" %}
-#rabbit_userid = guest
-#rabbit_password = guest
-#rabbit_virtual_host = /
-#rabbit_use_ssl = False
-#rabbit_hosts = 127.0.0.1:5672
 
 ########################
 ## Service Configuration
diff --git a/src/templates/mitaka/nova_sink.cfg b/src/templates/mitaka/nova_sink.cfg
index df46b8b..4b35c02 100644
--- a/src/templates/mitaka/nova_sink.cfg
+++ b/src/templates/mitaka/nova_sink.cfg
@@ -1,7 +1,6 @@
 {% 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 %}