summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cloudinit/user_data.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py
index e163c722..cc55daf8 100644
--- a/cloudinit/user_data.py
+++ b/cloudinit/user_data.py
@@ -236,7 +236,12 @@ class UserDataProcessor(object):
" a invalid http code of %s"),
include_url, resp.code)
except UrlError as urle:
- LOG.warning(urle)
+ message = str(urle)
+ # Older versions of requests.exceptions.HTTPError may not
+ # include the errant url. Append it for clarity in logs.
+ if include_url not in message:
+ message += ' for url: {0}'.format(include_url)
+ LOG.warning(message)
except IOError as ioe:
LOG.warning("Fetching from %s resulted in %s",
include_url, ioe)