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

Proposed by Björn Tillenius
Status: Merged
Merged at revision: 61
Proposed branch: lp://qastaging/~bjornt/charms/trusty/ceph-osd/symlinks
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/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-osd/symlinks
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+284753@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_lint_check #18507 ceph-osd-next for bjornt mp284753
    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/14858260/
Build: http://10.245.162.77:8080/job/charm_lint_check/18507/

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

charm_unit_test #17243 ceph-osd-next for bjornt mp284753
    UNIT OK: passed

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

62. By Björn Tillenius

Lint.

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

charm_lint_check #18511 ceph-osd-next for bjornt mp284753
    LINT OK: passed

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

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

charm_unit_test #17246 ceph-osd-next for bjornt mp284753
    UNIT OK: passed

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

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

charm_amulet_test #9152 ceph-osd-next for bjornt mp284753
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/14860334/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9152/

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

charm_amulet_test #9156 ceph-osd-next for bjornt mp284753
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
Timeout occurred (2700s), printing juju status...environment: osci-sv05
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/14861090/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9156/

Revision history for this message
Björn Tillenius (bjornt) wrote :

It doesn't look to me like that this branch is to blame for the amulet failures, but I can't retrigger the bot myself and I have no place to run the amulet tests locally.

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

charm_unit_test #114 ceph-osd-next for bjornt mp284753
    UNIT OK: passed

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

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

charm_lint_check #131 ceph-osd-next for bjornt mp284753
    LINT OK: passed

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

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

charm_amulet_test #16 ceph-osd-next for bjornt mp284753
    AMULET OK: passed

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

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