Skip to content

Commit

Permalink
Merge pull request #64 from namtzigla/master
Browse files Browse the repository at this point in the history
force proxy off for metadata queries
  • Loading branch information
Sean OMeara committed Aug 8, 2014
2 parents fe3e118 + 2732d52 commit f2b5f05
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions libraries/ec2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,20 @@ def query_role

def query_role_credentials(role = query_role)
fail "Instance has no IAM role." if role.to_s.empty?
creds = open("http://169.254.169.254/latest/meta-data/iam/security-credentials/#{role}"){|f| JSON.parse(f.string)}
creds = open("http://169.254.169.254/latest/meta-data/iam/security-credentials/#{role}",options = {:proxy => false}){|f| JSON.parse(f.string)}
Chef::Log.debug("Retrieved instance credentials for IAM role #{role}")
creds
end

def query_instance_id
instance_id = open('http://169.254.169.254/latest/meta-data/instance-id'){|f| f.gets}
instance_id = open('http://169.254.169.254/latest/meta-data/instance-id',options = {:proxy => false}){|f| f.gets}
raise "Cannot find instance id!" unless instance_id
Chef::Log.debug("Instance ID is #{instance_id}")
instance_id
end

def query_instance_availability_zone
availability_zone = open('http://169.254.169.254/latest/meta-data/placement/availability-zone/'){|f| f.gets}
availability_zone = open('http://169.254.169.254/latest/meta-data/placement/availability-zone/', options = {:proxy => false}){|f| f.gets}
raise "Cannot find availability zone!" unless availability_zone
Chef::Log.debug("Instance's availability zone is #{availability_zone}")
availability_zone
Expand Down

0 comments on commit f2b5f05

Please sign in to comment.