From 2064bd3d986d28c36ab4df96085cea164e2257d5 Mon Sep 17 00:00:00 2001 From: Jan Klare Date: Wed, 6 Jul 2016 16:17:43 +0200 Subject: [PATCH] rabbitmq cluster_nodes attributes should be array of hashes Change-Id: I471ef78d72adc76848e6c04322918d81093530dd --- recipes/rabbitmq-server.rb | 7 ++++--- spec/rabbitmq-server_spec.rb | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/rabbitmq-server.rb b/recipes/rabbitmq-server.rb index d2c36b5..a6e5291 100644 --- a/recipes/rabbitmq-server.rb +++ b/recipes/rabbitmq-server.rb @@ -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 diff --git a/spec/rabbitmq-server_spec.rb b/spec/rabbitmq-server_spec.rb index 09e4214..8ff1b0f 100644 --- a/spec/rabbitmq-server_spec.rb +++ b/spec/rabbitmq-server_spec.rb @@ -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