Merge ~chad.smith/cloud-init:fix-include-url-error-message-centos into cloud-init:master

[Chad Smith]

centos: Provide the failed #include url in error messages

On python 2.6 and 2.7 (CentOS 6 & 7), UrlErrors raised by requests.exceptions.HTTPError do not report the url which failed.
In such cases, append the url if not present in the error message.

This fixes nightly CI failures at
https://jenkins.ubuntu.com/server/view/cloud-init/job/cloud-init-ci-nightly/.

centos: Provide the failed #include url in error messages

On python 2.6 and 2.7 (CentOS 6 & 7), UrlErrors raised do not report which url failed.
In such cases, append the url if not present in the error message.

This fixes nightly CI failures at
https://jenkins.ubuntu.com/server/view/cloud-init/job/cloud-init-ci-nightly/.

[Joshua Powers (powersj)]

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:4198475ff145abc357b3acf424958ed2a01bdaad
https://jenkins.ubuntu.com/server/job/cloud-init-ci/505/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/505/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

one thing to note is that we run 2.7 in 'tox', so its not stricktly 2.7.
something else is different than just the python major.minor

ie, this does not fail in 'tox -e py27'

[Scott Moser (smoser)]

just add a comment on this branch in the exception handling as it might look odd.
clean up the commit message and i approve.

review: Approve

5c5b79b... by Chad Smith on 2017-11-17

add comment explaining that we append the url in error on older versions on requests

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:5c5b79bb0062f275e523706b8ab247487e9001d6
https://jenkins.ubuntu.com/server/job/cloud-init-ci/508/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/508/rebuild

review: Approve (continuous-integration)

diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py
index e163c72..cc55daf 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)