From 2c194b1e1c52d26a60339168356aafc53848c047 Mon Sep 17 00:00:00 2001
From: Daniel DeLeo <dan@opscode.com>
Date: Thu, 5 May 2011 21:21:18 -0700
Subject: [PATCH] [CHEF-2311] special case EC2 to show the public IP

---
 chef/lib/chef/knife/core/node_presenter.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/chef/lib/chef/knife/core/node_presenter.rb b/chef/lib/chef/knife/core/node_presenter.rb
index 4ef59df294f..80239bce30e 100644
--- a/chef/lib/chef/knife/core/node_presenter.rb
+++ b/chef/lib/chef/knife/core/node_presenter.rb
@@ -60,14 +60,17 @@ class NodePresenter < GenericPresenter
         def summarize(data)
           if data.kind_of?(Chef::Node)
             node = data
+            # special case ec2 with their split horizon whatsis.
+            ip = (node[:ec2] && node[:ec2][:public_ipv4]) || node[:ipaddress]
+
             summarized=<<-SUMMARY
 #{ui.color('Node Name:', :bold)}   #{ui.color(node.name, :bold)}
 #{key('Environment:')} #{node.chef_environment}
 #{key('FQDN:')}        #{node[:fqdn]}
-#{key('IP:')}          #{node[:ipaddress]}
+#{key('IP:')}          #{ip}
 #{key('Run List:')}    #{node.run_list}
 #{key('Roles:')}       #{Array(node[:roles]).join(', ')}
-#{key('Recipes')}      #{Array(node[:recipes]).join(', ')}
+#{key('Recipes:')}     #{Array(node[:recipes]).join(', ')}
 #{key('Platform:')}    #{node[:platform]} #{node[:platform_version]}
 SUMMARY
             if config[:medium_output] || config[:long_output]