Merge lp:~1chb1n/charms/trusty/glance/next-lp1536241-addl into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Ryan Beisner]

Retry temp_url registration until swift registers its endpoint.

In the interest of time, pulled the following and resolved the import error, proposed against glance/next:
https://code.launchpad.net/~james-page/charms/trusty/glance/lp1536241/+merge/283501

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

charm_lint_check #17862 glance-next for 1chb1n mp283540
    LINT OK: passed

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

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

charm_unit_test #16693 glance-next for 1chb1n mp283540
    UNIT OK: passed

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

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

charm_amulet_test #8940 glance-next for 1chb1n mp283540
    AMULET OK: passed

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

=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2016-01-13 14:31:40 +0000
+++ hooks/glance_utils.py	2016-01-21 19:26:07 +0000
@@ -244,9 +244,6 @@
     return configs
 
 
-# NOTE(jamespage): Retry deals with sync issues during one-shot HA deploys.
-#                  mysql might be restarting or suchlike.
-@retry_on_exception(5, base_delay=3, exc_type=subprocess.CalledProcessError)
 def determine_packages():
     packages = set(PACKAGES)
 
@@ -257,6 +254,9 @@
     return sorted(packages)
 
 
+# NOTE(jamespage): Retry deals with sync issues during one-shot HA deploys.
+#                  mysql might be restarting or suchlike.
+@retry_on_exception(5, base_delay=3, exc_type=subprocess.CalledProcessError)
 def migrate_database():
     '''Runs glance-manage to initialize a new database
     or migrate existing
@@ -484,19 +484,29 @@
                                      keystone_ctxt['service_host'],
                                      keystone_ctxt['service_port'])
     from swiftclient import client
-    swift_connection = client.Connection(
-        authurl=auth_url, user='glance', key=keystone_ctxt['admin_password'],
-        tenant_name=keystone_ctxt['admin_tenant_name'], auth_version='2.0')
-
-    account_stats = swift_connection.head_account()
-    if 'x-account-meta-temp-url-key' in account_stats:
-        log("Temp URL key was already posted.")
-        return account_stats['x-account-meta-temp-url-key']
-
-    temp_url_key = pwgen(length=64)
-    swift_connection.post_account(headers={'x-account-meta-temp-url-key':
-                                           temp_url_key})
-    return temp_url_key
+    from swiftclient import exceptions
+
+    @retry_on_exception(15, base_delay=10,
+                        exc_type=exceptions.ClientException)
+    def connect_and_post():
+        log('Connecting swift client...')
+        swift_connection = client.Connection(
+            authurl=auth_url, user='glance',
+            key=keystone_ctxt['admin_password'],
+            tenant_name=keystone_ctxt['admin_tenant_name'],
+            auth_version='2.0')
+
+        account_stats = swift_connection.head_account()
+        if 'x-account-meta-temp-url-key' in account_stats:
+            log("Temp URL key was already posted.")
+            return account_stats['x-account-meta-temp-url-key']
+
+        temp_url_key = pwgen(length=64)
+        swift_connection.post_account(headers={'x-account-meta-temp-url-key':
+                                               temp_url_key})
+        return temp_url_key
+
+    return connect_and_post()
 
 
 def is_paused(status_get=status_get):