Merge lp://qastaging/~bjornt/charms/trusty/ceph/symlinks into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next

Proposed by Björn Tillenius
Status: Merged
Merged at revision: 131
Proposed branch: lp://qastaging/~bjornt/charms/trusty/ceph/symlinks
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 77 lines (+61/-1)
2 files modified
hooks/ceph_hooks.py (+3/-1)
unit_tests/test_config.py (+58/-0)
To merge this branch: bzr merge lp://qastaging/~bjornt/charms/trusty/ceph/symlinks
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+284754@code.qastaging.launchpad.net

Description of the change

Handle symlinks in the osd-devices config.

If a path is a symlink, get_devices() will resolve it so that
the check if the disk is mounted works properly.

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

charm_unit_test #17245 ceph-next for bjornt mp284754
    UNIT OK: passed

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

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

charm_lint_check #18509 ceph-next for bjornt mp284754
    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/14858267/
Build: http://10.245.162.77:8080/job/charm_lint_check/18509/

132. By Björn Tillenius

Lint.

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

charm_lint_check #18510 ceph-next for bjornt mp284754
    LINT OK: passed

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

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

charm_unit_test #17247 ceph-next for bjornt mp284754
    UNIT OK: passed

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

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

charm_amulet_test #9153 ceph-next for bjornt mp284754
    AMULET OK: passed

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

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

charm_amulet_test #9155 ceph-next for bjornt mp284754
    AMULET OK: passed

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

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

charm_lint_check #121 ceph-next for bjornt mp284754
    LINT OK: passed

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

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

charm_unit_test #125 ceph-next for bjornt mp284754
    UNIT OK: passed

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

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

charm_amulet_test #8 ceph-next for bjornt mp284754
    AMULET OK: passed

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

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