From c2ee546db7eff77c88bc0e2fd4595c53669e4f1b Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Mon, 29 Jun 2015 21:20:01 +0000 Subject: [PATCH] add pre-kilo ceph-mon service status checks --- tests/basic_deployment.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 720a24fb..4aba7fc0 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -8,7 +8,7 @@ from charmhelpers.contrib.openstack.amulet.deployment import ( from charmhelpers.contrib.openstack.amulet.utils import ( OpenStackAmuletUtils, DEBUG, - #ERROR + # ERROR ) # Use DEBUG to turn on debug logging @@ -214,8 +214,11 @@ class CephOsdBasicDeployment(OpenStackAmuletDeployment): services[self.ceph0_sentry] = ceph_services services[self.ceph1_sentry] = ceph_services services[self.ceph2_sentry] = ceph_services - - #!? add check for ceph_osd_sentry upstart services + services[self.ceph_osd_sentry] = [ + '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) if ret: