From 2d6c3fa8b26b25f65557d84f0493bad9a52ebafa Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Mon, 9 Jan 2017 16:45:01 -0800 Subject: [PATCH] Add ceph-create-keys to explicitly create admin/bootstrap keys Signed-off-by: Vasu Kulkarni --- qa/tasks/ceph_deploy.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py index c0ea784234617..5cde20404be3d 100644 --- a/qa/tasks/ceph_deploy.py +++ b/qa/tasks/ceph_deploy.py @@ -295,17 +295,14 @@ def build_ceph_cluster(ctx, config): # try the next block which will wait up to 15 minutes to gatherkeys. execute_ceph_deploy(mon_create_nodes) - estatus_gather = execute_ceph_deploy(gather_keys) - max_gather_tries = 90 - gather_tries = 0 - while (estatus_gather != 0): - gather_tries += 1 - if gather_tries >= max_gather_tries: - msg = 'ceph-deploy was not able to gatherkeys after 15 minutes' - raise RuntimeError(msg) - estatus_gather = execute_ceph_deploy(gather_keys) - time.sleep(10) + # create-keys is explicit now + # http://tracker.ceph.com/issues/16036 + mons = ctx.cluster.only(teuthology.is_type('mon')) + for remote in mons.remotes.iterkeys(): + remote.run(args=['sudo', 'ceph-create-keys', '--cluster', 'ceph', + '--id', remote.shortname]) + estatus_gather = execute_ceph_deploy(gather_keys) if mds_nodes: estatus_mds = execute_ceph_deploy(deploy_mds) if estatus_mds != 0: -- 2.39.5