From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Feb 2020 22:41:26 +0000 (-0600)
Subject: Merge PR #33244 into master
X-Git-Tag: v15.1.1~425
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b84bb2f6966702183b561cd5bca4aa093189c77;p=ceph.git

Merge PR #33244 into master

* refs/pull/33244/head:
	doc/mgr/orchestrator_modules: update docs
	mgr/orch: break out apply_$type() in orchestrator.py interface
	qa/tasks/cephadm: adapt to new cli
	mgr/orch: add --force arg to 'daemon rm'
	mgr/orch: fix host set-addr prefix
	mgr/orch: service action cleanup
	mgr/orch: prevent rm mon|mgr
	mgr/orch: service rm -> rm
	mgr/cephadm: add mon
	mgr/orch: add mon hook
	mgr/cephadm: add mgr
	mgr/orch: add 'daemon add mgr'
	mgr/orch: orch * add -> orch daemon add *
	mgr/volumes: use apply_mds
	mgr/orch: move to service_apply; remove update_foo()
	mgr/rook: move to remove_service()
	mgr/orch: remove old remove_{osds,rgw,mds,nfs,...} methods
	mgr/orch: test remove_daemons and remove_service

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

9b84bb2f6966702183b561cd5bca4aa093189c77