openstack
/
cookbook-openstack-ops-messaging
Code Issues Proposed changes

rabbitmq cluster_nodes attributes should be array of hashes 

Change-Id: I471ef78d72adc76848e6c04322918d81093530dd
This commit is contained in:
Jan Klare 2016-07-06 16:17:43 +02:00
parent 93507bd15c
commit 2064bd3d98
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
recipes/rabbitmq-server.rb
View File

@ -51,9 +51,10 @@ if node['openstack']['mq']['cluster']
if node['openstack']['mq']['search_for_cluster_disk_nodes']
qs = "recipes:openstack-ops-messaging\\:\\:rabbitmq-server AND chef_environment:#{node.chef_environment}"
node.normal['rabbitmq']['clustering']['use_auto_clustering'] = true
node.normal['rabbitmq']['clustering']['cluster_nodes'] = search(:node, qs).map do |n|
"#{user}@#{n['hostname']}"
end.sort
node.normal['rabbitmq']['clustering']['cluster_nodes'] =
search(:node, qs).sort_by { |n| n['hostname'] }.map do |n|
{ name: "#{user}@#{n['hostname']}" }
end
end
end

2
spec/rabbitmq-server_spec.rb
View File

@ -62,7 +62,7 @@ describe 'openstack-ops-messaging::rabbitmq-server' do
it 'overrides and sorts cluster_disk_nodes' do
expect(chef_run.node['rabbitmq']['clustering']['cluster_nodes']).to eq(
['guest@host1', 'guest@host2']
[{ 'name' => 'guest@host1' }, { 'name' => 'guest@host2' }]
)
end