x/cloud-init
Code Issues Proposed changes

DataSourceGCE: fix 'is_resolvable', remove unnecessary WARN

Browse Source
This commit is contained in:
Scott Moser 2014-02-14 14:29:02 -05:00
parent 539d1733ac
commit eb6ab3fd3d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cloudinit/sources/DataSourceGCE.py
View File

@ -61,7 +61,7 @@ class DataSourceGCE(sources.DataSource):
] ]
# if we cannot resolve the metadata server, then no point in trying # if we cannot resolve the metadata server, then no point in trying
if not util.is_resolvable(self.metadata_address): if not util.is_resolvable_url(self.metadata_address):
LOG.debug("%s is not resolvable", self.metadata_address) LOG.debug("%s is not resolvable", self.metadata_address)
return False return False
@ -93,9 +93,6 @@ class DataSourceGCE(sources.DataSource):
LOG.warn(msg, path, e) LOG.warn(msg, path, e)
return False return False
msg = "Failed to get %s metadata item: %s." msg = "Failed to get %s metadata item: %s."
if found:
LOG.warn(msg, path, e)
else:
LOG.debug(msg, path, e) LOG.debug(msg, path, e)
self.metadata[mkey] = None self.metadata[mkey] = None