x/cloud-init
Code Issues Proposed changes

cloudinit/DataSourceEc2: use util.is_resolvable_url

Browse Source
This commit is contained in:
Scott Moser 2011-12-18 12:02:04 -05:00
parent a7f6b05eac
commit d88b22f965
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cloudinit/DataSourceEc2.py
View File

@ -114,7 +114,7 @@ class DataSourceEc2(DataSource.DataSource):
starttime = time.time() starttime = time.time()
# Remove addresses from the list that wont resolve. # Remove addresses from the list that wont resolve.
filtered = [x for x in mdurls if try_to_resolve_metadata(x)] filtered = [x for x in mdurls if util.is_resolvable_url(x)]
if set(filtered) != set(mdurls): if set(filtered) != set(mdurls):
log.debug("removed the following from metadata urls: %s" % log.debug("removed the following from metadata urls: %s" %
@ -221,15 +221,6 @@ class DataSourceEc2(DataSource.DataSource):
return True return True
return False return False
def try_to_resolve_metadata(url):
try:
addr = urlparse.urlsplit(url).netloc.split(":")[0]
socket.getaddrinfo(addr, None)
return True
except Exception as e:
return False
datasources = [ datasources = [
( DataSourceEc2, ( DataSource.DEP_FILESYSTEM , DataSource.DEP_NETWORK ) ), ( DataSourceEc2, ( DataSource.DEP_FILESYSTEM , DataSource.DEP_NETWORK ) ),
] ]