Juju Charms Collection
ceph package

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

Proposed by Chris MacNaughton on 2016-01-11

Status:	Merged
Merged at revision:	127
Proposed branch:	lp://staging/~chris.macnaughton/charms/trusty/ceph/add-infernalis
Merge into:	lp://staging/~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target:	1388 lines (+1131/-34) 7 files modified README.md (+1/-1) files/upstart/ceph-hotplug.conf (+1/-1) hooks/ceph.py (+80/-9) hooks/ceph_hooks.py (+2/-1) hooks/charmhelpers/contrib/openstack/utils.py (+1011/-0) hooks/charmhelpers/core/host.py (+34/-17) hooks/charmhelpers/fetch/giturl.py (+2/-5)
To merge this branch:	bzr merge lp://staging/~chris.macnaughton/charms/trusty/ceph/add-infernalis
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Chris Holcombe (community)		Approve on 2016-01-14
OpenStack Charmers	2016-01-11	Pending
Review via email: mp+282185@code.staging.launchpad.net

Description of the change

change to allow infernalis install

Changes:
- infernalis and up use ceph user
- rename ceph-disk-prepare and ceph-disk-activate to use the un-aliased versions of ceph-disk prepare/activate

lp://staging/~chris.macnaughton/charms/trusty/ceph/add-infernalis updated on 2016-01-11

129. By Chris MacNaughton on 2016-01-11: remove commented out addition

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-11:

charm_unit_test #15957 ceph-next for chris.macnaughton mp282185
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-11:

charm_lint_check #17083 ceph-next for chris.macnaughton mp282185
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/14469861/
Build: http://10.245.162.77:8080/job/charm_lint_check/17083/

lp://staging/~chris.macnaughton/charms/trusty/ceph/add-infernalis updated on 2016-01-11

130. By Chris MacNaughton on 2016-01-11: update for lint

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-11:

charm_lint_check #17084 ceph-next for chris.macnaughton mp282185
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-11:

charm_unit_test #15958 ceph-next for chris.macnaughton mp282185
UNIT OK: passed

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

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2016-01-11:

Initial testing @ rev130 shows potential user / dir permissions issue.

http://pastebin.ubuntu.com/14471658/
http://pastebin.ubuntu.com/14471690/
http://pastebin.ubuntu.com/14471699/

Here's the cmd it tripped over:
/usr/bin/ceph-osd --cluster ceph --mkfs --mkkey -i 4 --monmap /srv/ceph/activate.monmap --osd-data /srv/ceph --osd-journal /srv/ceph/journal --osd-uuid a36c9044-25aa-42db-b0ce-470d183a2ca9 --keyring /srv/ceph/keyring --setuser ceph --setgroup ceph

Test bundle:
http://bazaar.launchpad.net/~ost-maintainers/openstack-charm-testing/trunk/view/head:/bundles/dev/ceph-next.yaml

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-11:

charm_amulet_test #8692 ceph-next for chris.macnaughton mp282185
AMULET OK: passed

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

lp://staging/~chris.macnaughton/charms/trusty/ceph/add-infernalis updated on 2016-01-12

131. By Chris MacNaughton on 2016-01-12: fix permissions when creating OSD with directory

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-12:

charm_unit_test #16052 ceph-next for chris.macnaughton mp282185
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-12:

charm_lint_check #17182 ceph-next for chris.macnaughton mp282185
LINT OK: passed

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

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2016-01-12:

Manually tested against trusty-mitaka-proposed (PASS):
http://paste.ubuntu.com/14479305/

Now waiting for the automation re-test for other test combos.

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-12:

charm_amulet_test #8731 ceph-next for chris.macnaughton mp282185
AMULET OK: passed

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

Revision history for this message

Chris Holcombe (xfactor973) wrote on 2016-01-14:

This looks good to me. Lets get it landed and start rolling some infernalis out!

review: Approve

Revision history for this message

Corey Bryant (corey.bryant) wrote on 2016-01-14:

It seems like the common code between ceph and ceph-osd should get moved to charm-helpers (perhaps to http://bazaar.launchpad.net/~charm-helpers/charm-helpers/devel/view/head:/charmhelpers/contrib/storage/linux/ceph.py), but since there's already a precedence of this I think it could be done as a separate task.