summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceGCE.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-02-14 14:29:02 -0500
committerScott Moser <smoser@ubuntu.com>2014-02-14 14:29:02 -0500
commit5e5c8051fb2b3bd7c39e46fb090b2df282779ea1 (patch)
tree623db0f4d3394fe6919ac9d0d79628e5e7a9a051 /cloudinit/sources/DataSourceGCE.py
parentb812776fcccd780a05cbbdd2d924f615e724bb60 (diff)
downloadvyos-cloud-init-5e5c8051fb2b3bd7c39e46fb090b2df282779ea1.tar.gz
vyos-cloud-init-5e5c8051fb2b3bd7c39e46fb090b2df282779ea1.zip
DataSourceGCE: fix 'is_resolvable', remove unnecessary WARN
Diffstat (limited to 'cloudinit/sources/DataSourceGCE.py')
-rw-r--r--cloudinit/sources/DataSourceGCE.py7
1 files 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