From e704cdf92d5ac602aa835a07286fb8fd6d1c1d4c Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Wed, 1 Apr 2015 11:41:03 -0500
Subject: [PATCH] Allow mq setup for keystone

In some cases, keystone notifications are required. This
Add identity to the list of component that could use messaging.

Another patch to identity will update the keystone.conf
template to make use of mq just like the other cookbooks do.

Change-Id: Id4a777e1fae53cd5ac48b860e4ac01a4e70be7e7
Partial-Bug: #1439306
---
 attributes/messaging.rb | 7 ++++++-
 spec/default_spec.rb    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/attributes/messaging.rb b/attributes/messaging.rb
index 7bff8a68..e7c23ea8 100644
--- a/attributes/messaging.rb
+++ b/attributes/messaging.rb
@@ -35,7 +35,7 @@ default['openstack']['endpoints']['mq']['bind_interface'] = nil
 # Services to assign mq attributes for
 ###################################################################
 services = %w{bare-metal block-storage compute database image
-              telemetry network orchestration}
+              identity telemetry network orchestration}
 
 ###################################################################
 # Generic default attributes
@@ -139,6 +139,11 @@ default['openstack']['mq']['image']['rabbit']['notification_topic'] =
   node['openstack']['mq']['image']['notification_topic']
 default['openstack']['mq']['image']['control_exchange'] = 'glance'
 
+# identity
+# AMQP topics used for openstack notifications, can be comma-separated values
+default['openstack']['mq']['identity']['notification_topics'] = 'notifications'
+default['openstack']['mq']['identity']['control_exchange'] = 'identity'
+
 # network
 # AMQP topics used for openstack notifications, can be comma-separated values
 default['openstack']['mq']['network']['notification_topics'] = 'notifications'
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index ef355f59..555a5a7f 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -80,7 +80,7 @@ describe 'openstack-common::default' do
     it 'enables rabbit ssl version for all services' do
       node.set['openstack']['mq']['rabbitmq']['kombu_ssl_version'] = 'TLSv1.2'
 
-      %w{bare-metal block-storage compute database image telemetry network orchestration}.each do |svc|
+      %w{bare-metal block-storage compute database image identity telemetry network orchestration}.each do |svc|
         expect(chef_run.node['openstack']['mq'][svc]['rabbit']['kombu_ssl_version']).to eq('TLSv1.2')
       end
     end