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

Proposed by Chris Johnston
Status: Merged
Merged at revision: 169
Proposed branch: lp:~cjohnston/charms/trusty/glance/amqp-required
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 36 lines (+15/-0)
2 files modified
README.md (+14/-0)
metadata.yaml (+1/-0)
To merge this branch: bzr merge lp:~cjohnston/charms/trusty/glance/amqp-required
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Chris Johnston Pending
OpenStack Charmers Pending
Review via email: mp+282776@code.launchpad.net

This proposal supersedes a proposal from 2015-09-15.

Commit message

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

To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

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/

Revision history for this message
Chris Johnston (cjohnston) : Posted in a previous version of this proposal
review: Needs Resubmitting
Revision history for this message
Edward Hope-Morley (hopem) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
Edward Hope-Morley (hopem) wrote :

Lgtm +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2015-04-30 10:49:30 +0000
3+++ README.md 2016-01-15 16:01:42 +0000
4@@ -81,6 +81,20 @@
5 Note that Glance in this configuration must be used with either Ceph or
6 Swift providing backing image storage.
7
8+Glance metering
9+===============
10+
11+In order to do Glance metering with Ceilometer, an AMQP relation is required
12+e.g.
13+
14+ juju deploy glance
15+ juju deploy rabbitmq-server
16+ juju deploy ceilometer-agent
17+ ...
18+ juju add-relation glance rabbitmq-server
19+ juju add-relation glance ceilometer-agent
20+ ...
21+
22 Deploying from source
23 ---------------------
24
25
26=== modified file 'metadata.yaml'
27--- metadata.yaml 2015-11-18 10:33:31 +0000
28+++ metadata.yaml 2016-01-15 16:01:42 +0000
29@@ -23,6 +23,7 @@
30 interface: pgsql
31 amqp:
32 interface: rabbitmq
33+ optional: true
34 object-store:
35 interface: swift-proxy
36 identity-service:

Subscribers

People subscribed via source and target branches