From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Nov 2019 15:33:36 +0000 (-0600)
Subject: Merge PR #31385 into master
X-Git-Tag: v15.1.0~1020
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22523d97b62f1e89fa1108779cae7c9b2747ccca;p=ceph.git

Merge PR #31385 into master

* refs/pull/31385/head:
	mgr/ssh: add 'osd rm'
	mgr/ssh: keep inventory and service cache keys in sync
	mgr/orchestrator_cli: fix 'service ls' table format
	mgr/ssh: invalidate service state on create, remove, and service action
	mgr/orchestrator: add invalidate() to OutdatableDictMixin
	mgr/ssh: cache services
	mgr/ssh: drop specialized _remove_{mds,mgr,rgw}
	mgr/ssh: change inventory_cache_timeout to seconds (not minutes)
	mgr/orchestrator: make wait poll every 1s (not 5s)

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

22523d97b62f1e89fa1108779cae7c9b2747ccca