Revert "quick bad fix: set ipaddress from global scope addresses only"

This reverts commit 83971da.
chirag-jog · Apr 13, 2012 · 790a806 · 790a806
1 parent 83971da
commit 790a806
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/lib/ohai/plugins/network.rb b/lib/ohai/plugins/network.rb
@@ -39,14 +39,10 @@
 def find_ip_and_mac(addresses, match = nil)
   ip = nil; mac = nil; ip6 = nil
   addresses.keys.each do |addr|
-    if addresses[addr]["family"].eql?("inet")
-      # skip non global scope addresses (if attribute "scope" exists)
-      next if addresses[addr].has_key? "scope" && addresses[addr]["scope"].downcase != "global"
-      if match.nil?
-        ip = addr
-      else
-        ip = addr if network_contains_address(match, addr, addresses[addr])
-      end
+    if match.nil?
+      ip = addr if addresses[addr]["family"].eql?("inet")
+    else
+      ip = addr if addresses[addr]["family"].eql?("inet") && network_contains_address(match, addr, addresses[addr])
     end
     ip6 = addr if addresses[addr]["family"].eql?("inet6") && addresses[addr]["scope"].eql?("Global")
     mac = addr if addresses[addr]["family"].eql?("lladdr")