Skip to content
Open
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions cookbooks/redis/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,10 @@
end

if ['solo', 'app', 'app_master', 'util'].include?(node[:instance_role])
redis_instance = if node.engineyard.environment.solo_cluster?
node.engineyard.environment.instances.first
else
node.engineyard.environment.utility_instances.find {|x| x.name == "redis"}
end
redis_instance = node[:engineyard][:environment][:instances].find {|x| x[:name] == "redis"}

if redis_instance
redis_instance_ip_address = `ping -c 1 #{redis_instance.private_hostname} | awk 'NR==1{gsub(/\\(|\\)/,"",$3); print $3}'`.chomp
redis_instance_ip_address = `ping -c 1 #{redis_instance[:private_hostname]} | awk 'NR==1{gsub(/\\(|\\)/,"",$3); print $3}'`.chomp
redis_instance_host_mapping = "#{redis_instance_ip_address} redis_instance"

execute "Remove existing redis_instance mapping from /etc/hosts" do
Expand Down