From 5e5c8051fb2b3bd7c39e46fb090b2df282779ea1 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 14 Feb 2014 14:29:02 -0500 Subject: DataSourceGCE: fix 'is_resolvable', remove unnecessary WARN --- cloudinit/sources/DataSourceGCE.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py index c993293f..7091e3c1 100644 --- a/cloudinit/sources/DataSourceGCE.py +++ b/cloudinit/sources/DataSourceGCE.py @@ -61,7 +61,7 @@ class DataSourceGCE(sources.DataSource): ] # 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) return False @@ -93,10 +93,7 @@ class DataSourceGCE(sources.DataSource): LOG.warn(msg, path, e) return False 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 -- cgit v1.2.3