openstack/cookbook-openstack-common
Code Issues Proposed changes

Merge "Add notification_topic attributes for all services"

Browse Source
This commit is contained in:
Jenkins 2014-02-26 18:06:59 +00:00 committed by Gerrit Code Review
commit 4ad20f5e56
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/messaging.rb
View File

@ -74,6 +74,7 @@ rabbit_defaults = {
################################################################### ###################################################################
services.each do |svc| services.each do |svc|
default['openstack']['mq'][svc]['service_type'] = node['openstack']['mq']['service_type'] default['openstack']['mq'][svc]['service_type'] = node['openstack']['mq']['service_type']
default['openstack']['mq'][svc]['notification_topic'] = 'notifications'
case node['openstack']['mq'][svc]['service_type'] case node['openstack']['mq'][svc]['service_type']
when 'qpid' when 'qpid'
@ -91,7 +92,6 @@ end
# Overrides and additional attributes for individual services # Overrides and additional attributes for individual services
################################################################### ###################################################################
# block-storage # block-storage
default['openstack']['mq']['block-storage']['notification_topic'] = 'notifications'
default['openstack']['mq']['block-storage']['qpid']['notification_topic'] = default['openstack']['mq']['block-storage']['qpid']['notification_topic'] =
node['openstack']['mq']['block-storage']['notification_topic'] node['openstack']['mq']['block-storage']['notification_topic']
default['openstack']['mq']['block-storage']['rabbit']['notification_topic'] = default['openstack']['mq']['block-storage']['rabbit']['notification_topic'] =