From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Wed, 8 Jun 2022 21:13:03 +0000 (-0400)
Subject: Merge pull request #46552 from guits/bkp-pacific-46481
X-Git-Tag: v16.2.11~547
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ddad3f38f3746b8c0fe03db9fbbdd5121964d28d;p=ceph.git

Merge pull request #46552 from guits/bkp-pacific-46481

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

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

ddad3f38f3746b8c0fe03db9fbbdd5121964d28d