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

Merge PR #40508 into master

* refs/pull/40508/head:
	mgr/cephadm: fix orch host add with multiple labels and no addr

Reviewed-by: Sage Weil <sage@redhat.com>
---

91eb165167185e65aec1d15e69644dee894fec87