From: Sage Weil <sage@redhat.com>
Date: Wed, 5 Feb 2020 22:07:28 +0000 (-0600)
Subject: Merge PR #33069 into master
X-Git-Tag: v15.1.1~535
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d1778d66ea6c379e75ab0617aeb28bdd72d91d2;p=ceph.git

Merge PR #33069 into master

* refs/pull/33069/head:
	cephadm: use appropriate default image for non-ceph components

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

1d1778d66ea6c379e75ab0617aeb28bdd72d91d2