Juju Charms Collection
ceph-osd package

Merge lp://qastaging/~james-page/charms/trusty/ceph-osd/multijournal-fixes into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

Proposed by James Page on 2016-01-29

Status:

Merged

Merged at revision:

Proposed branch:

lp://qastaging/~james-page/charms/trusty/ceph-osd/multijournal-fixes

Merge into:

lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

Diff against target:

216 lines (+96/-20)

2 files modified

hooks/ceph.py (+42/-7)
hooks/ceph_hooks.py (+54/-13)

To merge this branch:

bzr merge lp://qastaging/~james-page/charms/trusty/ceph-osd/multijournal-fixes

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Chris MacNaughton (community)		Approve on 2016-01-29
OpenStack Charmers	2016-01-29	Pending
Review via email: mp+284394@code.qastaging.launchpad.net

Description of the change

Fixup misc lint and rebase Peters changes for multi-journal support.

Revision history for this message

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

charm_unit_test #17079 ceph-osd-next for james-page mp284394
UNIT OK: passed

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

Revision history for this message

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

charm_lint_check #18331 ceph-osd-next for james-page mp284394
LINT OK: passed

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

Revision history for this message

Chris MacNaughton (chris.macnaughton) wrote on 2016-01-29:

Looks good to me:

ubuntu@juju-ss-machine-7:/var/lib/ceph/osd/ceph-0$ ls -al
total 60
...
lrwxrwxrwx 1 root root 58 Jan 29 08:01 journal -> /dev/disk/by-partuuid/f0b6c78c-228c-41bb-9143-782225231eb4

ubuntu@juju-ss-machine-7:/var/lib/ceph/osd/ceph-3$ ls -al
total 48
...
lrwxrwxrwx 1 root root 58 Jan 29 08:01 journal -> /dev/disk/by-partuuid/ebed4b43-3582-4352-b3eb-46b8e93bba2d

ubuntu@juju-ss-machine-7:/var/lib/ceph/osd/ceph-0$ ls -l /dev/vd*
brw-rw---- 1 root disk 253, 64 Jan 29 08:02 /dev/vde
brw-rw---- 1 root disk 253, 65 Jan 29 08:02 /dev/vde1
brw-rw---- 1 root disk 253, 80 Jan 29 08:02 /dev/vdf
brw-rw---- 1 root disk 253, 81 Jan 29 08:02 /dev/vdf1