From: Sage Weil Date: Thu, 24 Aug 2017 13:52:17 +0000 (-0400) Subject: qa/tasks/ceph_deploy: gatherkeys before mgr deploy X-Git-Tag: v12.2.0~25 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bad3a299aa6ba1e49530718b9574c5fe84363f7;p=ceph.git qa/tasks/ceph_deploy: gatherkeys before mgr deploy Otherwise we may be missing the bootstrap-mgr key. Signed-off-by: Sage Weil (cherry picked from commit 800fdd9953013f975acd70de060bb828c83f30bc) --- diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py index eb287525290..b22c32113ce 100644 --- a/qa/tasks/ceph_deploy.py +++ b/qa/tasks/ceph_deploy.py @@ -297,7 +297,6 @@ def build_ceph_cluster(ctx, config): # are taking way more than a minute/monitor to form quorum, so lets # try the next block which will wait up to 15 minutes to gatherkeys. execute_ceph_deploy(mon_create_nodes) - execute_ceph_deploy(mgr_create) # create-keys is explicit now # http://tracker.ceph.com/issues/16036 @@ -307,6 +306,9 @@ def build_ceph_cluster(ctx, config): '--id', remote.shortname]) estatus_gather = execute_ceph_deploy(gather_keys) + + execute_ceph_deploy(mgr_create) + if mds_nodes: estatus_mds = execute_ceph_deploy(deploy_mds) if estatus_mds != 0: