diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-08-22 16:36:32 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-08-22 16:36:32 -0400 |
| commit | ba20ec431aa9275423d2e09154f5befb8961373b (patch) | |
| tree | a5b7cad4967b208815ac8b0cabfa589e0a0354d4 /cloudinit/sources/DataSourceCloudStack.py | |
| parent | f181c7cbdc08222f195fa84a379f35a456d26123 (diff) | |
| parent | d723c17b7abe5263d879d748dade763034cce476 (diff) | |
| download | vyos-cloud-init-ba20ec431aa9275423d2e09154f5befb8961373b.tar.gz vyos-cloud-init-ba20ec431aa9275423d2e09154f5befb8961373b.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/DataSourceCloudStack.py')
| -rw-r--r-- | cloudinit/sources/DataSourceCloudStack.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py index 08f661e4..1bbeca59 100644 --- a/cloudinit/sources/DataSourceCloudStack.py +++ b/cloudinit/sources/DataSourceCloudStack.py @@ -78,7 +78,8 @@ class DataSourceCloudStack(sources.DataSource): (max_wait, timeout) = self._get_url_settings() - urls = [self.metadata_address + "/latest/meta-data/instance-id"] + urls = [uhelp.combine_url(self.metadata_address, + 'latest/meta-data/instance-id')] start_time = time.time() url = uhelp.wait_for_url(urls=urls, max_wait=max_wait, timeout=timeout, status_cb=LOG.warn) |