diff options
| author | Paul Rossman <paul@factory9.com> | 2013-09-17 13:44:30 -0500 |
|---|---|---|
| committer | adamedx <adamed@opscode.com> | 2013-10-10 10:45:10 -0700 |
| commit | b0a0fc5c4bb5ad6021267bad0b4b43ccf1d59224 (patch) | |
| tree | dc037664381bf2eade02d60df1e1d96879fdd4c7 | |
| parent | 498ada58995f5493a6a14903c269b1f3204874a6 (diff) | |
| download | ohai-b0a0fc5c4bb5ad6021267bad0b4b43ccf1d59224.tar.gz | |
verify gce only by metadata.google.internal, remove dmi check
| -rw-r--r-- | lib/ohai/mixin/gce_metadata.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/plugins/gce.rb | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/lib/ohai/mixin/gce_metadata.rb b/lib/ohai/mixin/gce_metadata.rb index 903fb294..109b25a6 100644 --- a/lib/ohai/mixin/gce_metadata.rb +++ b/lib/ohai/mixin/gce_metadata.rb @@ -23,7 +23,7 @@ module Ohai extend self - GCE_METADATA_ADDR = "metadata" unless defined?(GCE_METADATA_ADDR) + GCE_METADATA_ADDR = "metadata.google.internal" unless defined?(GCE_METADATA_ADDR) GCE_METADATA_URL = "/computeMetadata/v1beta1/?recursive=true" unless defined?(GCE_METADATA_URL) def can_metadata_connect?(addr, port, timeout=2) diff --git a/lib/ohai/plugins/gce.rb b/lib/ohai/plugins/gce.rb index de5b0b4f..d8a4c313 100644 --- a/lib/ohai/plugins/gce.rb +++ b/lib/ohai/plugins/gce.rb @@ -18,16 +18,8 @@ provides "gce" require 'ohai/mixin/gce_metadata' - -GOOGLE_SYSFS_DMI = '/sys/firmware/dmi/entries/1-0/raw' - -#https://developers.google.com/compute/docs/instances#dmi -def has_google_dmi? - ::File.read(GOOGLE_SYSFS_DMI).include?('Google') -end - def looks_like_gce? - hint?('gce') || (has_google_dmi? && Ohai::Mixin::GCEMetadata.can_metadata_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR,80)) + hint?('gce') || Ohai::Mixin::GCEMetadata.can_metadata_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR,80) end if looks_like_gce? |