x/cloud-init
Code Issues Proposed changes

use url_helper to combine url

Browse Source 
This seems cleaner, to avoid duplicate '/' being added.
This commit is contained in:
Scott Moser 2014-08-21 13:46:41 -04:00
parent a169f854cf
commit 26a1aa5741
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloudinit/sources/DataSourceCloudStack.py
View File

@ -78,7 +78,8 @@ class DataSourceCloudStack(sources.DataSource):
(max_wait, timeout) = self._get_url_settings() (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() start_time = time.time()
url = uhelp.wait_for_url(urls=urls, max_wait=max_wait, url = uhelp.wait_for_url(urls=urls, max_wait=max_wait,
timeout=timeout, status_cb=LOG.warn) timeout=timeout, status_cb=LOG.warn)