Juju Charms Collection
ceph-osd package

Merge lp://staging/~chris.macnaughton/charms/trusty/ceph-osd/trunk into lp://staging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into next
Proposed by Chris MacNaughton
Status: Needs review
Proposed branch: lp://staging/~chris.macnaughton/charms/trusty/ceph-osd/trunk
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph-osd/next
Diff against target: 1778 lines (+1103/-119)
18 files modified
config.yaml (+2/-1)
hooks/ceph_hooks.py (+19/-3)
hooks/charmhelpers/cli/__init__.py (+3/-3)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+44/-8)
hooks/charmhelpers/contrib/network/ip.py (+5/-3)
hooks/charmhelpers/core/hookenv.py (+46/-0)
hooks/charmhelpers/core/host.py (+60/-17)
hooks/charmhelpers/core/hugepage.py (+10/-1)
hooks/charmhelpers/core/kernel.py (+68/-0)
hooks/charmhelpers/core/services/helpers.py (+5/-2)
hooks/charmhelpers/core/strutils.py (+30/-0)
hooks/charmhelpers/core/templating.py (+13/-6)
hooks/charmhelpers/fetch/__init__.py (+1/-1)
metadata.yaml (+5/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+4/-2)
tests/charmhelpers/contrib/amulet/utils.py (+284/-62)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+123/-10)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+381/-0)
To merge this branch: bzr merge lp://staging/~chris.macnaughton/charms/trusty/ceph-osd/trunk
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+277135@code.staging.launchpad.net

Description of the change

Add storage hooks support

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

charm_unit_test #12559 ceph-osd-next for chris.macnaughton mp277135
    UNIT OK: passed

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

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

charm_lint_check #13425 ceph-osd-next for chris.macnaughton mp277135
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

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

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

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

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

Reply
lp://staging/~chris.macnaughton/charms/trusty/ceph-osd/trunk updated
56. By Chris MacNaughton

add-storage-hooks

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

charm_unit_test #13062 ceph-osd-next for chris.macnaughton mp277135
    UNIT OK: passed

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

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

charm_lint_check #14013 ceph-osd-next for chris.macnaughton mp277135
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

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

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

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

charm_amulet_test #7940 ceph-osd-next for chris.macnaughton mp277135
    AMULET OK: passed

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

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

FYI, the lint fail is https://github.com/juju/charm-tools/issues/41 (charm proof isn't yet storage-aware). Fix-committed upstream, package not yet fix-released.

Reply
Revision history for this message
James Page (james-page) wrote :

Hi Chris

Please can you update this proposal to add support for the journal device as well - I've just landed that into the ceph charm.

Cheers

James

review: Needs Fixing
Reply
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

James, referencing https://code.launchpad.net/~james-page/charms/trusty/ceph/lp1535315/+merge/282975 ?

Reply
Revision history for this message
James Page (james-page) wrote :

Chris - no not that one - specifically the changes that landed into ceph:

storage:
  osd-devices:
    type: block
    multiple:
      range: 0-
  osd-journal:
    type: block
    multiple:
      range: 0-1

Reply

Unmerged revisions

56. By Chris MacNaughton

add-storage-hooks

55. By Chris MacNaughton

add storage hooks

54. By Chris MacNaughton

update charmhelpers

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