lib/ohai/plugins/ec2.rb in ohai-0.6.12 vs lib/ohai/plugins/ec2.rb in ohai-0.6.14.rc.1
- old
+ new
@@ -41,10 +41,10 @@
end
def looks_like_ec2?
# Try non-blocking connect so we don't "block" if
# the Xen environment is *not* EC2
- has_ec2_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
+ hint?('ec2') || has_ec2_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
end
if looks_like_ec2?
Ohai::Log.debug("looks_like_ec2? == true")
ec2 Mash.new