From 6a8b3ede434ef5c84e22340fd372eccf7ab769de Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@thalesgroup.com>
Date: Fri, 10 Mar 2017 18:12:13 +0100
Subject: [PATCH] Trove: add oslo_messaging_notifications config

Trove can send RPC notifications to Ceilometer as define here:
https://github.com/openstack/ceilometer/blob/master/ceilometer/pipeline/data/event_definitions.yaml#L444

oslo_messaging_notifications section MUST be managed in conf files.

Change-Id: I063b9807686e9b4ca6f7e7bfa6a444191378e513
---
 ansible/roles/trove/templates/trove-taskmanager.conf.j2 | 8 ++++++++
 ansible/roles/trove/templates/trove.conf.j2             | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
index 1f6fff2d95..95423b0bfa 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -24,3 +24,11 @@ swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_api_por
 [database]
 connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}
 max_retries = -1
+
+[oslo_messaging_notifications]
+{% if enable_ceilometer | bool %}
+driver = messagingv2
+topics = 'notifications'
+{% else %}
+driver = noop
+{% endif %}
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index 6c97b89ae6..08d4c54676 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -35,3 +35,11 @@ username = {{ trove_keystone_user }}
 password = {{ trove_keystone_password }}
 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
 auth_type = password
+
+[oslo_messaging_notifications]
+{% if enable_ceilometer | bool %}
+driver = messagingv2
+topics = 'notifications'
+{% else %}
+driver = noop
+{% endif %}