Merge lp://qastaging/~chris.macnaughton/charms/trusty/ceph-osd/storage-hooks into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

charm_unit_test #17081 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

charm_lint_check #18334 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

charm_amulet_test #9098 ceph-osd-next for chris.macnaughton mp284445
    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/14695879/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9098/

charm_unit_test #17082 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

charm_lint_check #18335 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

charm_amulet_test #9099 ceph-osd-next for chris.macnaughton mp284445
    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/14697247/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9099/

charm_lint_check #18448 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

charm_unit_test #17187 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

charm_amulet_test #9145 ceph-osd-next for chris.macnaughton mp284445
    AMULET OK: passed

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

charm_unit_test #122 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

charm_lint_check #136 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

charm_amulet_test #21 ceph-osd-next for chris.macnaughton mp284445
    AMULET OK: passed

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

Chris

I have reservations about the actions being implemented here; they overlap heavily with what juju storage should be doing and I'm not sure they are the right direction.

That said, the juju storage stuff looks great - does the ceph charm suffer from the 'new versions' problem for early unit lifecycle as well?

Didn't mean for the actions (incomplete) to be on here; you'll notice the mini hook, add-storage, that shims in support to make the hooks ok later since they will fire before the install hook.

charm_unit_test #740 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

charm_lint_check #837 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

charm_unit_test #743 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

charm_lint_check #841 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

charm_amulet_test #336 ceph-osd-next for chris.macnaughton mp284445
    AMULET OK: passed

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