Merge lp://qastaging/~hopem/charms/trusty/nova-compute/lp1489463 into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 201
Proposed branch: lp://qastaging/~hopem/charms/trusty/nova-compute/lp1489463
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 90 lines (+17/-13)
2 files modified
hooks/nova_compute_hooks.py (+11/-4)
templates/kilo/nova.conf (+6/-9)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/nova-compute/lp1489463
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+285486@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 #139 nova-compute-next for hopem mp285486
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/139/

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

charm_unit_test #131 nova-compute-next for hopem mp285486
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/131/

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

charm_amulet_test #26 nova-compute-next for hopem mp285486
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/15004581/
Build: http://10.245.162.36:8080/job/charm_amulet_test/26/

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

^ FYI, an undercloud network issue occurred as this test was being executed. I've retriggered.

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

charm_amulet_test #28 nova-compute-next for hopem mp285486
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/28/

Revision history for this message
Liam Young (gnuoy) wrote :

Approved

review: Approve

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