]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/ceph_deploy: gatherkeys before mgr deploy
authorSage Weil <sage@redhat.com>
Thu, 24 Aug 2017 13:52:17 +0000 (09:52 -0400)
committerSage Weil <sage@redhat.com>
Thu, 24 Aug 2017 17:41:50 +0000 (13:41 -0400)
Otherwise we may be missing the bootstrap-mgr key.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 800fdd9953013f975acd70de060bb828c83f30bc)

qa/tasks/ceph_deploy.py

index eb287525290b4c225b52a8bd7b62d17123d94306..b22c32113ced9305c82bcf99e5440f527284cc0e 100644 (file)
@@ -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: