diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-03-08 15:38:27 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-03-08 15:38:27 -0500 |
| commit | e40c7c0a1ae8119e38a877154070e5fa63677a66 (patch) | |
| tree | 971f856c069aeee3b6acb0cb11faff3a3e46b7e1 /cloudinit | |
| parent | db695dcd2d31770b33f5b7cb4ff0811209d175a3 (diff) | |
| download | vyos-cloud-init-e40c7c0a1ae8119e38a877154070e5fa63677a66.tar.gz vyos-cloud-init-e40c7c0a1ae8119e38a877154070e5fa63677a66.zip | |
DataSourceMaaS: some fixes found in testing
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/DataSourceMaaS.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/DataSourceMaaS.py b/cloudinit/DataSourceMaaS.py index 6bad0dfe..fd9d6316 100644 --- a/cloudinit/DataSourceMaaS.py +++ b/cloudinit/DataSourceMaaS.py @@ -76,6 +76,8 @@ class DataSourceMaaS(DataSource.DataSource): (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 @@ class DataSourceMaaS(DataSource.DataSource): 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) |