From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Mar 2020 17:21:52 +0000 (-0500)
Subject: Merge PR #34030 into octopus
X-Git-Tag: v15.2.0~17
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5f8450f0910d0b583a5533c8c4460b2d4be6e8f9;p=ceph.git

Merge PR #34030 into octopus

* refs/pull/34030/head:
	cephadm: env over last used
	cephadm: fall back to default for infer_image
	cephadm: remove outdated check
	cephadm: consolidate default image logic
	cephadm: only infer image for shell, run, inspect-image, pull, ceph-volume

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

5f8450f0910d0b583a5533c8c4460b2d4be6e8f9