From 8ad552adbfbe55b3a1af749e3051ae3e2af6e08a Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Fri, 31 Jan 2014 10:33:53 +0000 Subject: [PATCH] Assign attributes for rabbit/qpid image mq notification_topic - Add default['openstack']['mq']['image']['notification_topic'] to messaging attributes. - Add default['openstack']['mq']['image']['rabbit']['notification_topic'] to messaging attributes. - Add default['openstack']['mq']['image']['qpid']['notification_topic'] to messaging attributes. Change-Id: If410076d2d869831dfcb68c01e05c762f9d0b073 Partial-Bug: #1274879 --- attributes/messaging.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/attributes/messaging.rb b/attributes/messaging.rb index 641d5b1e..e370cc4b 100644 --- a/attributes/messaging.rb +++ b/attributes/messaging.rb @@ -89,6 +89,7 @@ end # Messaging attributes used by the OpenStack Image (Glance) service default['openstack']['mq']['image']['service_type'] = node['openstack']['mq']['service_type'] default['openstack']['mq']['image']['notifier_strategy'] = 'noop' +default['openstack']['mq']['image']['notification_topic'] = 'glance_notifications' case node['openstack']['mq']['image']['service_type'] when 'qpid' default['openstack']['mq']['image']['qpid']['host'] = node['openstack']['mq']['host'] @@ -106,12 +107,14 @@ when 'qpid' default['openstack']['mq']['image']['qpid']['heartbeat'] = 60 default['openstack']['mq']['image']['qpid']['protocol'] = 'tcp' default['openstack']['mq']['image']['qpid']['tcp_nodelay'] = true + default['openstack']['mq']['image']['qpid']['notification_topic'] = node['openstack']['mq']['image']['notification_topic'] when 'rabbitmq' default['openstack']['mq']['image']['rabbit']['userid'] = node['openstack']['mq']['user'] default['openstack']['mq']['image']['rabbit']['vhost'] = node['openstack']['mq']['vhost'] default['openstack']['mq']['image']['rabbit']['port'] = node['openstack']['mq']['port'] default['openstack']['mq']['image']['rabbit']['host'] = node['openstack']['mq']['host'] default['openstack']['mq']['image']['rabbit']['use_ssl'] = false + default['openstack']['mq']['image']['rabbit']['notification_topic'] = node['openstack']['mq']['image']['notification_topic'] end # Messaging attributes used by the OpenStack Metering (Ceilometer) service