Merge lp://qastaging/~hopem/charms/trusty/nova-compute/add-rbd-cache-config-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 161
Proposed branch: lp://qastaging/~hopem/charms/trusty/nova-compute/add-rbd-cache-config-support
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 77 lines (+34/-1)
4 files modified
charm-helpers-hooks.yaml (+1/-1)
config.yaml (+8/-0)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0)
hooks/nova_compute_context.py (+19/-0)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/nova-compute/add-rbd-cache-config-support
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+264539@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #6295 nova-compute-next for hopem mp264539
    LINT OK: passed

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

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

charm_unit_test #5927 nova-compute-next for hopem mp264539
    UNIT OK: passed

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

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

charm_amulet_test #5150 nova-compute-next for hopem mp264539
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/11891005/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5150/

146. By Edward Hope-Morley

sync trunk

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

charm_lint_check #6504 nova-compute-next for hopem mp264539
    LINT OK: passed

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

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

charm_unit_test #6136 nova-compute-next for hopem mp264539
    UNIT OK: passed

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

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

charm_amulet_test #5226 nova-compute-next for hopem mp264539
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/11908779/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5226/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

FYI - The amulet test failure for 052-basic-trusty-kilo-git is pre-existing and does not appear to be related to this proposal.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches