From: Sage Weil <sage@newdream.net>
Date: Mon, 5 Apr 2021 18:14:22 +0000 (-0400)
Subject: Merge PR #40459 into master
X-Git-Tag: v17.1.0~2370
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6200ba41397578e1d5ffd2fb3a5b8e81f4984f63;p=ceph.git

Merge PR #40459 into master

* refs/pull/40459/head:
	mgr/cephadm: don't cleanup the daemon keyring on failed redeploy

Reviewed-by: Adam King <adking@redhat.com>
---

6200ba41397578e1d5ffd2fb3a5b8e81f4984f63