Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix hardcoded --ram node type for cluster join #327

Merged
merged 2 commits into from
Feb 2, 2016
Merged

fix hardcoded --ram node type for cluster join #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80f20c1
fix hardcoded --ram node type for cluster join, fixes #326
scalp42 Dec 16, 2015
d91f9e3
update rubocop
scalp42 Jan 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ MethodLength:

Style/FileName:
Enabled: false

Metrics/AbcSize:
Max: 16
9 changes: 5 additions & 4 deletions providers/cluster.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ def joined_cluster?(node_name, cluster_status)
end

# Join cluster.
def join_cluster(cluster_name)
cmd = "rabbitmqctl join_cluster --ram #{cluster_name}"
def join_cluster(cluster_name, type)
cmd = "rabbitmqctl join_cluster #{type == 'ram' ? '--ram' : ''} #{cluster_name}".squeeze(' ')
Chef::Log.debug("[rabbitmq_cluster] Executing #{cmd}")
cmd = get_shellout(cmd)
cmd.run_command
Expand Down Expand Up @@ -195,16 +195,17 @@ def change_cluster_node_type(cluster_node_type)
var_cluster_status = cluster_status
var_node_name = node_name
var_node_name_to_join = parse_cluster_nodes_string(new_resource.cluster_nodes).first['name']
var_node_type = parse_cluster_nodes_string(new_resource.cluster_nodes).first['type']

if var_node_name == var_node_name_to_join
Chef::Log.warn('[rabbitmq_cluster] Trying to join cluster node itself. Joining cluster will be skipped.')
elsif joined_cluster?(var_node_name_to_join, var_cluster_status)
Chef::Log.warn("[rabbitmq_cluster] Node is already member of #{current_cluster_name(var_cluster_status)}. Joining cluster will be skipped.")
else
run_rabbitmqctl('stop_app')
join_cluster(var_node_name_to_join)
join_cluster(var_node_name_to_join, var_node_type)
run_rabbitmqctl('start_app')
Chef::Log.info("[rabbitmq_cluster] Node #{var_node_name} joined in #{var_node_name_to_join}")
Chef::Log.info("[rabbitmq_cluster] Node #{var_node_name} joined in #{var_node_name_to_join} with type #{var_node_type}")
Chef::Log.info(cluster_status)
end
end
Expand Down