Merge lp://qastaging/~chris.macnaughton/charms/trusty/ceph-osd/trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next
Proposed by
Chris MacNaughton
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~chris.macnaughton/charms/trusty/ceph-osd/trunk |
Merge into: | lp://qastaging/~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://qastaging/~chris.macnaughton/charms/trusty/ceph-osd/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Needs Fixing | ||
Review via email: mp+277135@code.qastaging.launchpad.net |
Description of the change
Add storage hooks support
To post a comment you must log in.
Unmerged revisions
- 56. By Chris MacNaughton
-
add-storage-hooks
- 55. By Chris MacNaughton
-
add storage hooks
- 54. By Chris MacNaughton
-
update charmhelpers
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/