Merge lp:~thedac/charms/trusty/glance/optional-amqp into lp:~openstack-charmers-archive/charms/trusty/glance/next

[David Ames]

Make messaging an optional relation for workload status

[Liam Young (gnuoy)]

Approved

review: Approve

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

charm_lint_check #11388 glance-next for thedac mp273542
    LINT OK: passed

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

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

charm_unit_test #10580 glance-next for thedac mp273542
    UNIT OK: passed

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

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

charm_amulet_test #7135 glance-next for thedac mp273542
    AMULET OK: passed

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

=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2015-10-02 21:27:28 +0000
+++ hooks/glance_utils.py	2015-10-06 15:01:23 +0000
@@ -125,7 +125,6 @@
 # list has a complete context.
 REQUIRED_INTERFACES = {
     'database': ['shared-db', 'pgsql-db'],
-    'messaging': ['amqp'],
     'identity': ['identity-service'],
 }
 
@@ -453,6 +452,9 @@
     if relation_ids('ceph') or relation_ids('object-store'):
         required_interfaces['storage-backend'] = ['ceph', 'object-store']
 
+    if relation_ids('amqp'):
+        required_interfaces['messaging'] = ['amqp']
+
     if required_interfaces:
         set_os_workload_status(configs, required_interfaces)
         return status_get()