From: Sage Weil <sage@newdream.net>
Date: Wed, 10 Nov 2021 01:00:23 +0000 (-0500)
Subject: Merge PR #43821 into master
X-Git-Tag: v17.1.0~478
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9c8d19e7caf7e8a2b546abe27888c7a4f436f0a8;p=ceph-ci.git

Merge PR #43821 into master

* refs/pull/43821/head:
	mgr/cephadm: allow osd spec removal
	mgr/orchestrator: pass 'force' flag down for remove_service

Reviewed-by: Adam King <adking@redhat.com>
---

9c8d19e7caf7e8a2b546abe27888c7a4f436f0a8