verify gce only by metadata.google.internal, remove dmi check

chef · Oct 10, 2013 · b0a0fc5 · b0a0fc5
1 parent 498ada5
commit b0a0fc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/lib/ohai/mixin/gce_metadata.rb b/lib/ohai/mixin/gce_metadata.rb
@@ -23,7 +23,7 @@ module GCEMetadata
 
       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
@@ -18,16 +18,8 @@
 
 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?