From: Sebastian Wagner <sewagner@redhat.com>
Date: Wed, 1 Dec 2021 17:04:44 +0000 (+0100)
Subject: Merge pull request #43149 from sebastian-philipp/cephadm-force-last-admin
X-Git-Tag: v17.1.0~325
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4898706a716ba40dd427ff3fe5bb0d077c0a87d5;p=ceph.git

Merge pull request #43149 from sebastian-philipp/cephadm-force-last-admin

mgr/cephadm: Add client.admin keyring when upgrading from older version

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@newdream.net>
---

4898706a716ba40dd427ff3fe5bb0d077c0a87d5