DataSourceMaaS: some fixes found in testing

smoser · smoser · commit e40c7c0a1ae8 · 2012-03-08T15:38:27.000-05:00
diff --git a/cloudinit/DataSourceMaaS.py b/cloudinit/DataSourceMaaS.py
@@ -76,6 +76,8 @@ def get_data(self):
 
             (userdata, metadata) = read_maas_seed_url(self.baseurl,
                 self.md_headers)
+            self.userdata_raw = userdata
+            self.metadata = metadata
             return True
         except Exception:
             util.logexc(log)
@@ -117,7 +119,7 @@ def wait_for_metadata_service(self, url):
             log.warn("Failed to get timeout, using %s" % timeout)
 
         starttime = time.time()
-        check_url = "%s/instance-id" % url
+        check_url = "%s/%s/meta-data/instance-id" % (url, MD_VERSION)
         url = util.wait_for_url(urls=[check_url], max_wait=max_wait,
             timeout=timeout, status_cb=log.warn,
             headers_cb=self.md_headers)
