From 5c43c5972ddb04724c8659a1b8d71cda1e0acdfb Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Thu, 24 Aug 2017 11:02:20 -0700 Subject: [PATCH] Add workaround for http://tracker.ceph.com/issues/20950 mgr bootstrap key differs on disk, rewrite the new key using auth get. Signed-off-by: Vasu Kulkarni --- qa/tasks/ceph_deploy.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py index 189fd32e8f226..56d451c2970ee 100644 --- a/qa/tasks/ceph_deploy.py +++ b/qa/tasks/ceph_deploy.py @@ -749,6 +749,21 @@ def upgrade(ctx, config): ] ) ceph_admin.run(args=['sudo', 'ceph', '-s']) + + # workaround for http://tracker.ceph.com/issues/20950 + # write the correct mgr key to disk + if config.get('setup-mgr-node', None): + mons = ctx.cluster.only(teuthology.is_type('mon')) + for remote, roles in mons.remotes.iteritems(): + remote.run( + args=[ + run.Raw('sudo ceph auth get client.bootstrap-mgr'), + run.Raw('|'), + run.Raw('sudo tee'), + run.Raw('/var/lib/ceph/bootstrap-mgr/ceph.keyring') + ] + ) + if config.get('setup-mgr-node', None): mgr_nodes = get_nodes_using_role(ctx, 'mgr') mgr_nodes = " ".join(mgr_nodes) -- 2.39.5