From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Wed, 22 Jun 2022 18:25:46 +0000 (-0400)
Subject: Merge pull request #46551 from guits/bkp-quincy-46481
X-Git-Tag: v17.2.4~243
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=562702744e864bdf1baf25555f30f81026809576;p=ceph.git

Merge pull request #46551 from guits/bkp-quincy-46481

quincy: backport of cephadm: fix osd adoption with custom cluster name

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

562702744e864bdf1baf25555f30f81026809576