From: Sage Weil <sage@redhat.com>
Date: Thu, 14 Nov 2019 16:33:24 +0000 (-0600)
Subject: Merge PR #31584 into master
X-Git-Tag: v15.1.0~902
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9be8cdf18d4ce6af3aba35a3381e0071f9d0bb7b;p=ceph-ci.git

Merge PR #31584 into master

* refs/pull/31584/head:
	common/options: osd_crush_chooseleaf_type is CLUSTER_CREATE
	mon/ConfigMonitor: do not assimilate CLUSTER_CREATE options
	common/ceph_context: observe container_image so we don't get warnings

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

9be8cdf18d4ce6af3aba35a3381e0071f9d0bb7b