Merge lp://qastaging/~xfactor973/charms/trusty/ceph/dashboard-wip into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/trunk

Proposed by Chris Holcombe
Status: Needs review
Proposed branch: lp://qastaging/~xfactor973/charms/trusty/ceph/dashboard-wip
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/trunk
Diff against target: 131 lines (+39/-5)
4 files modified
.bzrignore (+1/-0)
hooks/ceph.py (+17/-3)
hooks/hooks.py (+19/-2)
metadata.yaml (+2/-0)
To merge this branch: bzr merge lp://qastaging/~xfactor973/charms/trusty/ceph/dashboard-wip
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+269974@code.qastaging.launchpad.net

Description of the change

This change is what was needed to get the Ceph dashboard working. I also fixed a small bug where the subprocess output wasn't being checked and failed the dashboard-relation-joined hook.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9246 ceph for xfactor973 mp269974
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/12256785/
Build: http://10.245.162.77:8080/job/charm_lint_check/9246/

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

charm_unit_test #8547 ceph for xfactor973 mp269974
    UNIT OK: passed

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

Revision history for this message
Chris Holcombe (xfactor973) wrote :

Those lint failures aren't something I changed.

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

charm_amulet_test #6237 ceph for xfactor973 mp269974
    AMULET OK: passed

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

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

charm_lint_check #12343 ceph for xfactor973 mp269974
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/12895619/
Build: http://10.245.162.77:8080/job/charm_lint_check/12343/

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

charm_unit_test #11452 ceph for xfactor973 mp269974
    UNIT OK: passed

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

Unmerged revisions

111. By Chris Holcombe

Patch to get the ceph dashboard operational

110. By Chris Holcombe

WIP

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