From: Joao Eduardo Luis <joao@suse.de>
Date: Tue, 18 Jul 2017 14:38:15 +0000 (+0100)
Subject: mon/AuthMonitor: generate bootstrap-mgr key on upgrade
X-Git-Tag: v12.1.2~227^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efa66b48a0dec7c37a91f9b1c23eb49eb5797528;p=ceph.git

mon/AuthMonitor: generate bootstrap-mgr key on upgrade

We were adding the entity, but no key. By generating a key, we avoid
making things really weird.

Fixes: http://tracker.ceph.com/issues/20666

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
---

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index e6473c5e417..3f82f4e33fe 100644
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -1463,6 +1463,8 @@ void AuthMonitor::upgrade_format()
       assert(r);
       ::encode("allow profile bootstrap-mgr", auth_inc.auth.caps["mon"]);
       auth_inc.op = KeyServerData::AUTH_INC_ADD;
+      // generate key
+      auth_inc.auth.key.create(g_ceph_context, CEPH_CRYPTO_AES);
       push_cephx_inc(auth_inc);
     }
     changed = true;