Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Altered condition for looks_like_ec2? so that failure of the EC2 MAC

address check doesn't prevent EC2 metadata collection in VPC.
  • Loading branch information...
commit 1cc5d0524afed98e27651e95fd4ad9926165e39d 1 parent 32ab486
Hector Castro authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  lib/ohai/plugins/ec2.rb
2  lib/ohai/plugins/ec2.rb
@@ -42,7 +42,7 @@ def has_ec2_mac?
42 42 def looks_like_ec2?
43 43 # Try non-blocking connect so we don't "block" if
44 44 # the Xen environment is *not* EC2
45   - has_ec2_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
  45 + has_ec2_mac? || can_metadata_connect?(EC2_METADATA_ADDR,80)
46 46 end
47 47
48 48 if looks_like_ec2?

0 comments on commit 1cc5d05

Please sign in to comment.
Something went wrong with that request. Please try again.