From 56dc20030b9c391a921d5fdbad014f07313a4cc6 Mon Sep 17 00:00:00 2001
From: ZhijunWei <wzj334965317@outlook.com>
Date: Wed, 19 Sep 2018 08:20:41 -0400
Subject: [PATCH] Update messaging notification configuration

This patch add the conditional inclusion of the notification
section of the service configuration. This ensures that oslo.messaging
notifications use the correct transport for deployments that have
separate rpc and notify messaging backends. For example, if the
transport_url is not provided in the notification section of the
service configuration, the transport_url specified in the default
section will be used instead.

This patch conditionally selects the notifier driver. The noop
driver will be selected when notification publishing is disabled.
The messagingv2 driver is selected when notification publishing is
enabled.

Change-Id: I60e92e14c0893b80f4023b6b6681864fee5228e5
Closes-Bug: #1794320
---
 defaults/main.yml        | 3 +++
 templates/tacker.conf.j2 | 1 +
 2 files changed, 4 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index 82e9b3e..6ca25c3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -20,6 +20,9 @@
 debug: False
 verbose: True
 
+# Enable/Disable Ceilometer
+tacker_ceilometer_enabled: False
+
 # Set the host which will execute the shade modules
 # for the service setup. The host must already have
 # clouds.yaml properly configured.
diff --git a/templates/tacker.conf.j2 b/templates/tacker.conf.j2
index b73d4f7..343ead9 100644
--- a/templates/tacker.conf.j2
+++ b/templates/tacker.conf.j2
@@ -110,4 +110,5 @@ openstack = {{ tacker_etc_dir }}/vim/fernet_keys
 ssl = {{ tacker_oslomsg_notify_use_ssl | bool }}
 
 [oslo_messaging_notifications]
+driver = {% if tacker_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
 transport_url = {{ tacker_oslomsg_notify_transport }}://{% for host in tacker_oslomsg_notify_servers.split(',') %}{{ tacker_oslomsg_notify_userid }}:{{ tacker_oslomsg_notify_password }}@{{ host }}:{{ tacker_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ tacker_oslomsg_notify_vhost }}{% if (tacker_oslomsg_notify_use_ssl | lower) | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}