openstack/cookbook-openstack-common
Code Issues Proposed changes

Merge "Assign attributes for rabbit/qpid image mq notification_topic"

Browse Source
This commit is contained in:
Jenkins
2014-02-12 14:01:41 +00:00
committed by Gerrit Code Review
parent 575e4af396 8ad552adbf
commit 970654cd19
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
attributes/messaging.rb
View File

@@ -92,6 +92,7 @@ end
# Messaging attributes used by the OpenStack Image (Glance) service # Messaging attributes used by the OpenStack Image (Glance) service
default['openstack']['mq']['image']['service_type'] = node['openstack']['mq']['service_type'] default['openstack']['mq']['image']['service_type'] = node['openstack']['mq']['service_type']
default['openstack']['mq']['image']['notifier_strategy'] = 'noop' default['openstack']['mq']['image']['notifier_strategy'] = 'noop'
default['openstack']['mq']['image']['notification_topic'] = 'glance_notifications'
case node['openstack']['mq']['image']['service_type'] case node['openstack']['mq']['image']['service_type']
when 'qpid' when 'qpid'
default['openstack']['mq']['image']['qpid']['host'] = node['openstack']['mq']['host'] default['openstack']['mq']['image']['qpid']['host'] = node['openstack']['mq']['host']
@@ -109,12 +110,14 @@ when 'qpid'
default['openstack']['mq']['image']['qpid']['heartbeat'] = 60 default['openstack']['mq']['image']['qpid']['heartbeat'] = 60
default['openstack']['mq']['image']['qpid']['protocol'] = 'tcp' default['openstack']['mq']['image']['qpid']['protocol'] = 'tcp'
default['openstack']['mq']['image']['qpid']['tcp_nodelay'] = true default['openstack']['mq']['image']['qpid']['tcp_nodelay'] = true
default['openstack']['mq']['image']['qpid']['notification_topic'] = node['openstack']['mq']['image']['notification_topic']
when 'rabbitmq' when 'rabbitmq'
default['openstack']['mq']['image']['rabbit']['userid'] = node['openstack']['mq']['user'] 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']['vhost'] = node['openstack']['mq']['vhost']
default['openstack']['mq']['image']['rabbit']['port'] = node['openstack']['mq']['port'] 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']['host'] = node['openstack']['mq']['host']
default['openstack']['mq']['image']['rabbit']['use_ssl'] = false default['openstack']['mq']['image']['rabbit']['use_ssl'] = false
default['openstack']['mq']['image']['rabbit']['notification_topic'] = node['openstack']['mq']['image']['notification_topic']
end end
# Messaging attributes used by the OpenStack Metering (Ceilometer) service # Messaging attributes used by the OpenStack Metering (Ceilometer) service