From e3875ad21ac10cfa29e5e1189f1fba2e0165e886 Mon Sep 17 00:00:00 2001 From: Iain Beeston Date: Wed, 17 Apr 2013 17:10:16 +1000 Subject: [PATCH] Fixed /etc/hosts check 1. It was accessing node info in a way that would crash for me 2. It was finding the wrong instance when on a solo cluster --- cookbooks/redis/recipes/default.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cookbooks/redis/recipes/default.rb b/cookbooks/redis/recipes/default.rb index 27dba470..3f9396e4 100644 --- a/cookbooks/redis/recipes/default.rb +++ b/cookbooks/redis/recipes/default.rb @@ -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