Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/networking/libraries/ipaddresses.rb b/cookbooks/networking/libraries/ipaddresses.rb
index d31d885f995076af73eef0d034023e4f5a97cb07..67c89d052192e6574df873751e3a44ea63b42d99 100644 (file)
--- a/cookbooks/networking/libraries/ipaddresses.rb
+++ b/cookbooks/networking/libraries/ipaddresses.rb
@@ -6,6 +6,8 @@ class Chef
       interfaces(options).each do |interface|
         address = interface[:public_address] || interface[:address]
 
+        next if address.nil?
+
         if block.nil?
           addresses << address
         else
@@ -16,12 +18,12 @@ class Chef
       addresses
     end
 
-    def internal_ipaddress
-      ipaddresses(:role => :internal).first
+    def internal_ipaddress(options = {})
+      ipaddresses(options.merge(:role => :internal)).first
     end
 
-    def external_ipaddress
-      ipaddresses(:role => :external).first
+    def external_ipaddress(options = {})
+      ipaddresses(options.merge(:role => :external)).first
     end
   end
 end