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

[Ionut-Madalin Balutoiu]

Adds additional variables to the image-service relation. These are available only when a relation with Swift object storage is present.

In case any charm needs to generate temporary URLs from Glance with Swift backend, it needs a temp-url-key which must be posted to Swift with the glance account. (Details: http://docs.openstack.org/liberty/config-reference/content/object-storage-tempurl.html)

This is needed for OpenStack Ironic charm (http://bazaar.launchpad.net/~cloudbaseit/charms/trusty/ironic/trunk/view/head:/hooks/ironic_context.py#L76), but might also be generally useful.

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

charm_lint_check #12926 glance-next for ionutbalutoiu mp276285
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/13010274/
Build: http://10.245.162.77:8080/job/charm_lint_check/12926/

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

charm_unit_test #12002 glance-next for ionutbalutoiu mp276285
    UNIT OK: passed

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

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

charm_amulet_test #7669 glance-next for ionutbalutoiu mp276285
    AMULET OK: passed

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

[David Ames (thedac)]

Thanks for participating in the charm ecosystem! This MP looks good with the exception of the lint failure. The lint failure is a simple flake8 check.

You can run this with:

flake8 --exclude hooks/charmhelpers,tests/charmhelpers actions hooks unit_tests tests

Once that is fixed we can merge it.

review: Needs Fixing

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

charm_lint_check #12928 glance-next for ionutbalutoiu mp276285
    LINT OK: passed

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

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

charm_unit_test #12004 glance-next for ionutbalutoiu mp276285
    UNIT OK: passed

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

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

charm_amulet_test #7671 glance-next for ionutbalutoiu mp276285
    AMULET OK: passed

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

[David Ames (thedac)]

Ionut-Madalin,

This looks good. I tested manually. Will merge.

Thanks again for participating in the charm community.

review: Approve

[lp:~ionutbalutoiu/charms/trusty/glance/next]

152. By David Ames on 2015-11-02

[ionutbalutoiu, r=thedac] Adds additional variables to the image-service relation. These are available only when a relation with Swift object storage is present.
In case any charm needs to generate temporary URLs from Glance with Swift backend, it needs a temp-url-key which must be posted to Swift with the glance account. (Details: http://docs.openstack.org/liberty/config-reference/content/object-storage-tempurl.html)
This is needed for OpenStack Ironic charm (http://bazaar.launchpad.net/~cloudbaseit/charms/trusty/ironic/trunk/view/head:/hooks/ironic_context.py#L76), but might also be generally useful.

=== modified file 'hooks/glance_relations.py'
--- hooks/glance_relations.py	2015-10-07 20:47:28 +0000
+++ hooks/glance_relations.py	2015-10-30 22:12:28 +0000
@@ -26,6 +26,7 @@
     setup_ipv6,
     REQUIRED_INTERFACES,
     check_optional_relations,
+    swift_temp_url_key
 )
 from charmhelpers.core.hookenv import (
     config,
@@ -222,6 +223,13 @@
     juju_log("%s: image-service_joined: To peer glance-api-server=%s" %
              (CHARM, relation_data['glance-api-server']))
 
+    if ('object-store' in CONFIGS.complete_contexts() and
+       'identity-service' in CONFIGS.complete_contexts()):
+        relation_data.update({
+            'swift-temp-url-key': swift_temp_url_key(),
+            'swift-container': 'glance'
+        })
+
     relation_set(relation_id=relation_id, **relation_data)
 
 
@@ -238,6 +246,8 @@
         juju_log('swift relation incomplete')
         return
 
+    [image_service_joined(rid) for rid in relation_ids('image-service')]
+
     CONFIGS.write(GLANCE_API_CONF)
 
 

=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2015-10-06 14:55:52 +0000
+++ hooks/glance_utils.py	2015-10-30 22:12:28 +0000
@@ -39,6 +39,7 @@
     service_restart,
     lsb_release,
     write_file,
+    pwgen
 )
 
 from charmhelpers.contrib.openstack import (
@@ -460,3 +461,33 @@
         return status_get()
     else:
         return 'unknown', 'No optional relations'
+
+
+def swift_temp_url_key():
+    """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.
+    """
+    keystone_ctxt = context.IdentityServiceContext(service='glance',
+                                                   service_user='glance')()
+    if not keystone_ctxt:
+        log('Missing identity-service relation. Skipping generation of '
+            'swift temporary url key.')
+        return
+
+    auth_url = '%s://%s:%s/v2.0/' % (keystone_ctxt['service_protocol'],
+                                     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