Merge lp:~jjo/charms/trusty/ceph-osd/fix-ceph-osd-nrpe into lp:~openstack-charmers-archive/charms/trusty/ceph-osd/next

[JuanJo Ciarlante]

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #5864 ceph-osd-next for jjo mp264915
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/11884484/
Build: http://10.245.162.77:8080/job/charm_unit_test/5864/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #6232 ceph-osd-next for jjo mp264915
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5131 ceph-osd-next for jjo mp264915
    AMULET OK: passed

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

[Billy Olsen (billy-olsen)]

Definitely seems like a worthwhile change to actually report status of all the OSDs

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-01-12 12:03:59 +0000
+++ hooks/hooks.py	2015-07-15 19:59:18 +0000
@@ -221,7 +221,8 @@
     nrpe_setup.add_check(
         shortname='ceph-osd',
         description='process check {%s}' % current_unit,
-        check_cmd='check_upstart_job ceph-osd',
+        check_cmd=('/bin/cat /var/lib/ceph/osd/ceph-*/whoami |'
+                   'xargs -I@ status ceph-osd id=@ && exit 0 || exit 2')
         )
     nrpe_setup.write()