merge from master at 0.7.9-90-g61eb03fe

1 files changed, 18 insertions, 0 deletions

diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py
index b1a1c8f2..637c9505 100644
--- a/cloudinit/sources/DataSourceGCE.py
+++ b/cloudinit/sources/DataSourceGCE.py
@@ -62,6 +62,9 @@ class DataSourceGCE(sources.DataSource):
             return public_key
 
     def get_data(self):
+        if not platform_reports_gce():
+            return False
+
         # url_map: (our-key, path, required, is_text)
         url_map = [
             ('instance-id', ('instance/id',), True, True),
@@ -144,6 +147,21 @@ class DataSourceGCE(sources.DataSource):
         return self.availability_zone.rsplit('-', 1)[0]
 
 
+def platform_reports_gce():
+    pname = util.read_dmi_data('system-product-name') or "N/A"
+    if pname == "Google Compute Engine":
+        return True
+
+    # system-product-name is not always guaranteed (LP: #1674861)
+    serial = util.read_dmi_data('system-serial-number') or "N/A"
+    if serial.startswith("GoogleCloud-"):
+        return True
+
+    LOG.debug("Not running on google cloud. product-name=%s serial=%s",
+              pname, serial)
+    return False
+
+
 # Used to match classes to dependencies
 datasources = [
     (DataSourceGCE, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),