From e1daa1693eec9a80118661855da0afd90237c32e Mon Sep 17 00:00:00 2001 From: tamil Date: Thu, 13 Jun 2013 16:26:42 -0700 Subject: [PATCH] modified ceph-deploy to throw appropriate exceptions Signed-off-by: tamil --- teuthology/task/ceph-deploy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/teuthology/task/ceph-deploy.py b/teuthology/task/ceph-deploy.py index 9e039779a8f6d..ebdf10282586c 100644 --- a/teuthology/task/ceph-deploy.py +++ b/teuthology/task/ceph-deploy.py @@ -175,24 +175,24 @@ def build_ceph_cluster(ctx, config): log.info('successfully created osd') no_of_osds += 1 else: - zap_disk = './ceph-deploy zapdisk'+" "+d + zap_disk = './ceph-deploy disk zap'+" "+d execute_ceph_deploy(ctx, config, zap_disk) estatus_osd = execute_ceph_deploy(ctx, config, osd_create_cmds) if estatus_osd==0: log.info('successfully created osd') no_of_osds += 1 else: - log.info('failed to create osd') + raise Exception("ceph-deploy: Failed to create osds") else: - log.info('failed to deploy mds') + raise Exception("ceph-deploy: Failed to deploy mds") else: - log.info('failed to create monitors') + raise Exception("ceph-deploy: Failed to create monitors") else: - log.info('failed to install ceph') + raise Exception("ceph-deploy: Failed to install ceph") else: - log.info('failed to create config file and monitor keyring') + raise Exception("ceph-deploy: new command failed") else: - log.info('no monitor nodes in the config file') + raise Exception("no monitor nodes in the config file") if config.get('wait-for-healthy', True) and no_of_osds >= 2: is_healthy(ctx=ctx, config=None) -- 2.39.5