From: Sebastian Wagner <sewagner@redhat.com>
Date: Wed, 19 Jan 2022 10:39:13 +0000 (+0100)
Subject: Merge pull request #44625 from sebastian-philipp/pacific-backport-43149
X-Git-Tag: v16.2.8~256
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26e4752bde1ef181717c2ebc441fa6b4eeaf9772;p=ceph.git

Merge pull request #44625 from sebastian-philipp/pacific-backport-43149

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

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

26e4752bde1ef181717c2ebc441fa6b4eeaf9772