From: Sage Weil <sage@newdream.net>
Date: Fri, 23 Apr 2021 12:21:50 +0000 (-0500)
Subject: Merge PR #40746 into pacific
X-Git-Tag: v16.2.2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5d38eee3ba726b42713871b94d99dae861ee0d2;p=ceph.git

Merge PR #40746 into pacific

* refs/pull/40746/head:
	doc/cephadm: fix a typo
	mgr/cephadm: rewrite/simplify describe_service
	mgr/orchestrator: report osds as osd.unmanaged as appropriate
	mgr/orchestrator: remove IMAGE ID from 'orch ls'
	cephadm: normalize unqualified repo digests to docker.io
	mgr/cephadm/upgrade: normalize unqualified target image
	cephadm:persist the grafana.db file
	qa/tasks/cephadm: add apply() method/task
	cephadm: pass '-i' to docker|podman run for shell|enter

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
---

a5d38eee3ba726b42713871b94d99dae861ee0d2