From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Mar 2020 16:33:14 +0000 (-0500)
Subject: Merge PR #33829 into octopus
X-Git-Tag: v15.1.1~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfc811d160455db41c9cfccaa6653506543b72c5;p=ceph.git

Merge PR #33829 into octopus

* refs/pull/33829/head:
	cephadm: log when we infer the image
	cephadm: Avoid `inspect` call by using ceph label
	cephadm: Infer ceph image

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

cfc811d160455db41c9cfccaa6653506543b72c5