summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-09-17 14:01:39 -0700
committerTim Smith <tsmith@chef.io>2018-09-17 14:01:39 -0700
commitaa196ad200b14c6ec0e803debd3f0c3eaa858824 (patch)
tree547004d044c23d52eb214f79228794233ad608c9
parent0ec8319cf8e0fb6a7f089e86b6241e068507e2fc (diff)
downloadohai-aa196ad200b14c6ec0e803debd3f0c3eaa858824.tar.gz
Revert "Connect to GCE metadata by IP not name"
This reverts commit 192f84944120bed9099a59e42b6fb43155cc0f6c.
-rw-r--r--lib/ohai/mixin/gce_metadata.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ohai/mixin/gce_metadata.rb b/lib/ohai/mixin/gce_metadata.rb
index 2e1e9c1d..f0f0ec22 100644
--- a/lib/ohai/mixin/gce_metadata.rb
+++ b/lib/ohai/mixin/gce_metadata.rb
@@ -20,7 +20,8 @@ module Ohai
module Mixin
module GCEMetadata
- GCE_METADATA_ADDR = "169.254.169.254".freeze unless defined?(GCE_METADATA_ADDR)
+ # Trailing dot to host is added to avoid DNS search path
+ GCE_METADATA_ADDR = "metadata.google.internal.".freeze unless defined?(GCE_METADATA_ADDR)
GCE_METADATA_URL = "/computeMetadata/v1/?recursive=true".freeze unless defined?(GCE_METADATA_URL)
# fetch the meta content with a timeout and the required header