From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Feb 2020 01:12:43 +0000 (-0600)
Subject: Merge PR #33098 into master
X-Git-Tag: v15.1.1~506
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0584db6221d8206e465eb7b08950404ee88cc9de;p=ceph.git

Merge PR #33098 into master

* refs/pull/33098/head:
	mgr/orch,cephadm: add 'host set-addr'
	mgr/orch: include addr (and labels) in 'host ls'
	mgr/cephadm: fix 'cephadm check-host'
	mgr/cephadm: use addr to contact host
	mgr/orch: pass HostSpec to add_host
	mgr/orch: HostSpec -> HostPlacementSpec

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

0584db6221d8206e465eb7b08950404ee88cc9de