From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 24 Aug 2017 18:02:20 +0000 (-0700)
Subject: Add workaround for http://tracker.ceph.com/issues/20950
X-Git-Tag: ses5-gm~5^2~5^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58ffed6fb9e8695deb53edd7754aed56c73403bd;p=ceph.git

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 <vasu@redhat.com>
(cherry picked from commit 5c43c5972ddb04724c8659a1b8d71cda1e0acdfb)
---

diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py
index 189fd32e8f22..56d451c2970e 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)