From 7c64e66fb67a78028feab5da27c723700c6e7b6e Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Tue, 4 Feb 2014 10:59:48 +0000 Subject: [PATCH] Assign attributes for rabbit/qpid image mq notification_topic - Add default['openstack']['mq']['block-storage']['notification_topic'] to messaging attributes. - Add default['openstack']['mq']['block-storage']['rabbit']['notification_topic'] to messaging attributes. - Add default['openstack']['mq']['block-storage']['qpid']['notification_topic'] to messaging attributes. Change-Id: I7f7262abeb09171ab2bcaee67b70928b2a37c2d0 Partial-Bug: #1276099 --- attributes/messaging.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/attributes/messaging.rb b/attributes/messaging.rb index 641d5b1e..0ac358ce 100644 --- a/attributes/messaging.rb +++ b/attributes/messaging.rb @@ -33,6 +33,7 @@ default['openstack']['mq']['vhost'] = '/' # Messaging attributes used by the OpenStack Volume (Cinder) service default['openstack']['mq']['block-storage']['service_type'] = node['openstack']['mq']['service_type'] +default['openstack']['mq']['block-storage']['notification_topic'] = 'notifications' case node['openstack']['mq']['block-storage']['service_type'] when 'qpid' default['openstack']['mq']['block-storage']['qpid']['host'] = node['openstack']['mq']['host'] @@ -50,6 +51,7 @@ when 'qpid' default['openstack']['mq']['block-storage']['qpid']['heartbeat'] = 60 default['openstack']['mq']['block-storage']['qpid']['protocol'] = 'tcp' default['openstack']['mq']['block-storage']['qpid']['tcp_nodelay'] = true + default['openstack']['mq']['block-storage']['qpid']['notification_topic'] = node['openstack']['mq']['block-storage']['notification_topic'] when 'rabbitmq' default['openstack']['mq']['block-storage']['rabbit']['userid'] = node['openstack']['mq']['user'] default['openstack']['mq']['block-storage']['rabbit']['vhost'] = node['openstack']['mq']['vhost'] @@ -57,6 +59,7 @@ when 'rabbitmq' default['openstack']['mq']['block-storage']['rabbit']['host'] = node['openstack']['mq']['host'] default['openstack']['mq']['block-storage']['rabbit']['ha'] = false default['openstack']['mq']['block-storage']['rabbit']['use_ssl'] = false + default['openstack']['mq']['block-storage']['rabbit']['notification_topic'] = node['openstack']['mq']['block-storage']['notification_topic'] end # Messaging attributes used by the OpenStack Compute (Nova) service