From: Sage Weil Date: Mon, 4 Nov 2019 14:17:16 +0000 (-0600) Subject: Merge PR #31292 into master X-Git-Tag: v15.1.0~1055 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a01f1dcbb1e85810e03f86fe974825c0347b3a4;p=ceph.git Merge PR #31292 into master * refs/pull/31292/head: mgr/ssh: fix remove_mds exception doc/mgr/orchestrator_cli: remove extra characters after checkmarks doc/mgr/orchestrator_cli: no {stop,start,restart} for all the random svcs mgr/ssh: add 'redeploy' operation ceph-daemon: stop + reset-failed existing unit on daemon deploy ceph-daemon: make second call arg optional ceph-daemon: make 'deploy' on mon only to mkfs step is mon doesn't yet exist mgr/ssh,orchestrator_cli: add 'restart' service action mgr/ssh: service[-instance] [start|stop] mgr/ssh: simplify get_services call for 'mds update' mgr/ssh: make _get_services take service *id* or service *name* mgr/ssh: fix 'service ls' on stopped services mgr/ssh: move some code around doc/mgr/orchestrator_cli: 'service ls' works for ssh doc/mgr/orchestrator_cli: we already completed mds ops for rook+ssh Reviewed-by: Sebastian Wagner --- 9a01f1dcbb1e85810e03f86fe974825c0347b3a4