Merge lp:~james-page/charms/trusty/glance/lp1536241 into lp:~openstack-charmers-archive/charms/trusty/glance/next

[James Page]

Retry temp_url registration until swift registers its endpoint.

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

charm_lint_check #17856 glance-next for james-page mp283501
    LINT OK: passed

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

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

charm_unit_test #16688 glance-next for james-page mp283501
    UNIT OK: passed

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

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

charm_amulet_test #8934 glance-next for james-page mp283501
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

2016-01-21 18:27:57 INFO identity-service-relation-changed Traceback (most recent call last):
2016-01-21 18:27:57 INFO identity-service-relation-changed File "/var/lib/juju/agents/unit-glance-0/charm/hooks/identity-service-relation-changed", line 534, in <module>
2016-01-21 18:27:57 INFO identity-service-relation-changed hooks.execute(sys.argv)
2016-01-21 18:27:57 INFO identity-service-relation-changed File "/var/lib/juju/agents/unit-glance-0/charm/hooks/charmhelpers/core/hookenv.py", line 717, in execute
2016-01-21 18:27:57 INFO identity-service-relation-changed self._hooks[hook_name]()
2016-01-21 18:27:57 INFO identity-service-relation-changed File "/var/lib/juju/agents/unit-glance-0/charm/hooks/charmhelpers/core/host.py", line 438, in wrapped_f
2016-01-21 18:27:57 INFO identity-service-relation-changed f(*args, **kwargs)
2016-01-21 18:27:57 INFO identity-service-relation-changed File "/var/lib/juju/agents/unit-glance-0/charm/hooks/identity-service-relation-changed", line 327, in keystone_changed
2016-01-21 18:27:57 INFO identity-service-relation-changed object_store_joined()
2016-01-21 18:27:57 INFO identity-service-relation-changed File "/var/lib/juju/agents/unit-glance-0/charm/hooks/charmhelpers/core/host.py", line 438, in wrapped_f
2016-01-21 18:27:57 INFO identity-service-relation-changed f(*args, **kwargs)
2016-01-21 18:27:57 INFO identity-service-relation-changed File "/var/lib/juju/agents/unit-glance-0/charm/hooks/identity-service-relation-changed", line 247, in object_store_joined
2016-01-21 18:27:57 INFO identity-service-relation-changed [image_service_joined(rid) for rid in relation_ids('image-service')]
2016-01-21 18:27:57 INFO identity-service-relation-changed File "/var/lib/juju/agents/unit-glance-0/charm/hooks/identity-service-relation-changed", line 227, in image_service_joined
2016-01-21 18:27:57 INFO identity-service-relation-changed 'swift-temp-url-key': swift_temp_url_key(),
2016-01-21 18:27:57 INFO identity-service-relation-changed File "/var/lib/juju/agents/unit-glance-0/charm/hooks/glance_utils.py", line 489, in swift_temp_url_key
2016-01-21 18:27:57 INFO identity-service-relation-changed exc_type=client.exceptions.ClientException)
2016-01-21 18:27:57 INFO identity-service-relation-changed AttributeError: 'module' object has no attribute 'exceptions'
2016-01-21 18:27:57 ERROR juju.worker.uniter.operation runhook.go:107 hook "identity-service-relation-changed" failed: exit status 1

review: Needs Fixing

[Ryan Beisner (1chb1n)]

FYI, see my piggy-back which includes these changes and resolves the import error.

https://code.launchpad.net/~1chb1n/charms/trusty/glance/next-lp1536241-addl/+merge/283540

Unmerged revisions

=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2016-01-13 14:31:40 +0000
+++ hooks/glance_utils.py	2016-01-21 16:23:21 +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,27 @@
                                      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
+
+    @retry_on_exception(15, base_delay=10,
+                        exc_type=client.exceptions.ClientException)
+    def connect_and_post():
+        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):