From: tamil Date: Tue, 16 Jul 2013 00:04:21 +0000 (-0700) Subject: calling mon destroy command after mds create X-Git-Tag: 1.1.0~2084 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=47696d2b92e64b5530ac933128756e9201aa8cdb;p=teuthology.git calling mon destroy command after mds create Signed-off-by: tamil --- diff --git a/teuthology/task/ceph-deploy.py b/teuthology/task/ceph-deploy.py index 9e32ebdd1a..706c2c6024 100644 --- a/teuthology/task/ceph-deploy.py +++ b/teuthology/task/ceph-deploy.py @@ -180,12 +180,7 @@ def build_ceph_cluster(ctx, config): estatus_mon = execute_ceph_deploy(ctx, config, mon_create_nodes) if estatus_mon != 0: raise Exception("ceph-deploy: Failed to create monitors") - for d in range(1, len(mon_node)): - mon_destroy_nodes = './ceph-deploy mon destroy'+" "+mon_node[d] - estatus_mon_d = execute_ceph_deploy(ctx, config, mon_destroy_nodes) - if estatus_mon_d != 0: - raise Exception("ceph-deploy: Failed to delete monitor") - + estatus_gather = execute_ceph_deploy(ctx, config, gather_keys) while (estatus_gather != 0): mon_create_nodes = './ceph-deploy mon create'+" "+mon_node[0] @@ -196,6 +191,12 @@ def build_ceph_cluster(ctx, config): if estatus_mds != 0: raise Exception("ceph-deploy: Failed to deploy mds") + for d in range(1, len(mon_node)): + mon_destroy_nodes = './ceph-deploy mon destroy'+" "+mon_node[d] + estatus_mon_d = execute_ceph_deploy(ctx, config, mon_destroy_nodes) + if estatus_mon_d != 0: + raise Exception("ceph-deploy: Failed to delete monitor") + node_dev_list = get_dev_for_osd(ctx, config) for d in node_dev_list: osd_create_cmds = './ceph-deploy osd create --zap-disk'+" "+d