summaryrefslogtreecommitdiff
path: root/cloudinit/user_data.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-04-27 12:50:12 -0400
committerScott Moser <smoser@brickies.net>2017-04-27 12:50:12 -0400
commit8310484a880690529a4936615df596d467e51708 (patch)
tree886aeb1a6e3ca809e466ddbcacbe9741b56dafa0 /cloudinit/user_data.py
parentaf63cf763946bca6163dc797195a3aeae975f8da (diff)
parent513e99e049eab4acea14e187f59d760adc755b40 (diff)
downloadvyos-cloud-init-8310484a880690529a4936615df596d467e51708.tar.gz
vyos-cloud-init-8310484a880690529a4936615df596d467e51708.zip
merge from 513e99e049ea at 0.7.9-113-g513e99e0
Diffstat (limited to 'cloudinit/user_data.py')
-rw-r--r--cloudinit/user_data.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py
index cfe5aa2f..88cb7f84 100644
--- a/cloudinit/user_data.py
+++ b/cloudinit/user_data.py
@@ -109,8 +109,9 @@ class UserDataProcessor(object):
ctype_orig = None
was_compressed = True
except util.DecompressionError as e:
- LOG.warn("Failed decompressing payload from %s of length"
- " %s due to: %s", ctype_orig, len(payload), e)
+ LOG.warning("Failed decompressing payload from %s of"
+ " length %s due to: %s",
+ ctype_orig, len(payload), e)
continue
# Attempt to figure out the payloads content-type
@@ -228,9 +229,9 @@ class UserDataProcessor(object):
if resp.ok():
content = resp.contents
else:
- LOG.warn(("Fetching from %s resulted in"
- " a invalid http code of %s"),
- include_url, resp.code)
+ LOG.warning(("Fetching from %s resulted in"
+ " a invalid http code of %s"),
+ include_url, resp.code)
if content is not None:
new_msg = convert_string(content)