From: Sage Weil <sage@newdream.net>
Date: Mon, 12 Apr 2021 15:45:50 +0000 (-0400)
Subject: Merge PR #40736 into master
X-Git-Tag: v17.1.0~2281
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=463bb3d2ef6b4461fbbb189498eeed4828c89ab2;p=ceph-ci.git

Merge PR #40736 into master

* refs/pull/40736/head:
	mgr/cephadm: rewrite/simplify describe_service
	mgr/orchestrator: report osds as osd.unmanaged as appropriate
	mgr/orchestrator: remove IMAGE ID from 'orch ls'

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

463bb3d2ef6b4461fbbb189498eeed4828c89ab2