openstack/charm-ceph-osd
Code Issues Proposed changes

add pre-kilo ceph-mon service status checks

Browse Source
This commit is contained in:
Ryan Beisner 2015-06-29 21:20:01 +00:00
parent 261ab212e0
commit c2ee546db7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/basic_deployment.py
View File

@ -8,7 +8,7 @@ from charmhelpers.contrib.openstack.amulet.deployment import (
from charmhelpers.contrib.openstack.amulet.utils import ( from charmhelpers.contrib.openstack.amulet.utils import (
OpenStackAmuletUtils, OpenStackAmuletUtils,
DEBUG, DEBUG,
#ERROR # ERROR
) )
# Use DEBUG to turn on debug logging # Use DEBUG to turn on debug logging
@ -214,8 +214,11 @@ class CephOsdBasicDeployment(OpenStackAmuletDeployment):
services[self.ceph0_sentry] = ceph_services services[self.ceph0_sentry] = ceph_services
services[self.ceph1_sentry] = ceph_services services[self.ceph1_sentry] = ceph_services
services[self.ceph2_sentry] = ceph_services services[self.ceph2_sentry] = ceph_services
services[self.ceph_osd_sentry] = [
#!? add check for ceph_osd_sentry upstart services 'ceph-osd-all',
'ceph-osd id={}'.format(u.get_ceph_osd_id_cmd(0)),
'ceph-osd id={}'.format(u.get_ceph_osd_id_cmd(1))
]
ret = u.validate_services_by_name(services) ret = u.validate_services_by_name(services)
if ret: if ret: