Merge lp:~cjohnston/charms/trusty/glance/amqp-required into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Chris Johnston]

Set AMQP interface to optional, provide documentation on the usage of the AMQP relation.

[Edward Hope-Morley (hopem)]

review: Needs Fixing

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

charm_lint_check #10126 glance-next for cjohnston mp271144
    LINT OK: passed

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

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

charm_unit_test #9288 glance-next for cjohnston mp271144
    UNIT OK: passed

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

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

charm_amulet_test #6463 glance-next for cjohnston mp271144
    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/12426488/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6463/

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Edward Hope-Morley (hopem)]

review: Needs Fixing

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

charm_lint_check #17397 glance-next for cjohnston mp282776
    LINT OK: passed

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

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

charm_unit_test #16253 glance-next for cjohnston mp282776
    UNIT OK: passed

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

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

charm_amulet_test #8810 glance-next for cjohnston mp282776
    AMULET OK: passed

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

[Edward Hope-Morley (hopem)]

Lgtm +1

review: Approve

=== modified file 'README.md'
--- README.md	2015-04-30 10:49:30 +0000
+++ README.md	2016-01-15 16:01:42 +0000
@@ -81,6 +81,20 @@
 Note that Glance in this configuration must be used with either Ceph or
 Swift providing backing image storage.
 
+Glance metering
+===============
+
+In order to do Glance metering with Ceilometer, an AMQP relation is required
+e.g.
+
+    juju deploy glance
+    juju deploy rabbitmq-server
+    juju deploy ceilometer-agent
+    ...
+    juju add-relation glance rabbitmq-server
+    juju add-relation glance ceilometer-agent
+    ...
+
 Deploying from source
 ---------------------
 
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-11-18 10:33:31 +0000
+++ metadata.yaml	2016-01-15 16:01:42 +0000
@@ -23,6 +23,7 @@
     interface: pgsql
   amqp:
     interface: rabbitmq
+    optional: true
   object-store:
     interface: swift-proxy
   identity-service: