Avoid exception iterating a non-existent directory

[chef.git] / cookbooks / networking / libraries / ipaddresses.rb

diff --git a/cookbooks/networking/libraries/ipaddresses.rb b/cookbooks/networking/libraries/ipaddresses.rb
index 811c81884387cbcd02cb7a5382bb123ccf35a93c..d31d885f995076af73eef0d034023e4f5a97cb07 100644 (file)
--- a/cookbooks/networking/libraries/ipaddresses.rb
+++ b/cookbooks/networking/libraries/ipaddresses.rb
@@ -4,10 +4,12 @@ class Chef
       addresses = []
 
       interfaces(options).each do |interface|
+        address = interface[:public_address] || interface[:address]
+
         if block.nil?
-          addresses << interface[:address]
+          addresses << address
         else
-          block.call(interface[:address])
+          yield address
         end
       end
 
@@ -15,11 +17,11 @@ class Chef
     end
 
     def internal_ipaddress
-      return ipaddresses(:role => :internal).first
+      ipaddresses(:role => :internal).first
     end
 
     def external_ipaddress
-      return ipaddresses(:role => :external).first
+      ipaddresses(:role => :external).first
     end
   end
 end