Merge lp:~gnuoy/charms/trusty/glance/1537769 into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #18192 glance-next for gnuoy mp284007
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/18192/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #16952 glance-next for gnuoy mp284007
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/16952/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #9058 glance-next for gnuoy mp284007
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/14673165/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9058/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #9067 glance-next for gnuoy mp284007
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/14675133/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9067/

[lp:~gnuoy/charms/trusty/glance/1537769]

166. By Liam Young on 2016-01-27

Late import requests

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #18197 glance-next for gnuoy mp284007
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/18197/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #16955 glance-next for gnuoy mp284007
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/16955/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #9070 glance-next for gnuoy mp284007
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/14679680/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9070/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #9072 glance-next for gnuoy mp284007
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/9072/

[James Page (james-page)]

review: Approve

=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2016-01-21 18:53:31 +0000
+++ hooks/glance_utils.py	2016-01-27 12:41:36 +0000
@@ -473,6 +473,7 @@
     """Generate a temp URL key, post it to Swift and return its value.
        If it is already posted, the current value of the key will be returned.
     """
+    import requests
     keystone_ctxt = context.IdentityServiceContext(service='glance',
                                                    service_user='glance')()
     if not keystone_ctxt:
@@ -487,7 +488,8 @@
     from swiftclient import exceptions
 
     @retry_on_exception(15, base_delay=10,
-                        exc_type=exceptions.ClientException)
+                        exc_type=(exceptions.ClientException,
+                                  requests.exceptions.ConnectionError))
     def connect_and_post():
         log('Connecting swift client...')
         swift_connection = client.Connection(