From c01a53c6df66dd3600d5d7e3baa474409c63920d Mon Sep 17 00:00:00 2001
From: Kirill Bespalov <kbespalov@mirantis.com>
Date: Tue, 17 Jan 2017 15:41:14 +0300
Subject: [PATCH] Add notifications support

The change does not enable notifications, just configure right
transport url for it via oslo_messaging template.

Change-Id: I466404295a34fd7f4232e728469280b188ccf9af
---
 service/files/keystone.conf.j2 | 4 ++--
 service/keystone.yaml          | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/service/files/keystone.conf.j2 b/service/files/keystone.conf.j2
index 5104bc5..4f76820 100644
--- a/service/files/keystone.conf.j2
+++ b/service/files/keystone.conf.j2
@@ -27,8 +27,8 @@ provider = fernet
 driver = sql
 
 {% if keystone.notifications.enable %}
-{# This section should be updated after https://review.openstack.org/#/c/419995/ is merged #}
 [oslo_messaging_notifications]
 driver = messagingv2
-transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }}
 {% endif %}
+
+{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }}
diff --git a/service/keystone.yaml b/service/keystone.yaml
index 0a280e9..56d2de3 100644
--- a/service/keystone.yaml
+++ b/service/keystone.yaml
@@ -53,6 +53,9 @@ service:
       daemon:
         dependencies:
           - memcached
+          # {% if keystone.notifications.enable -%}
+          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
+          # {%- endif %}
         files:
           - keystone-conf
           - wsgi-keystone-conf