From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Dec 2019 21:59:20 +0000 (-0600)
Subject: Merge PR #32281 into master
X-Git-Tag: v15.1.0~392
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3d26fa9058d58a7f00cd2eb3394de81da8dcc9b;p=ceph-ci.git

Merge PR #32281 into master

* refs/pull/32281/head:
	mgr/cephadm: fix =[] default arg to _create_daemon
	qa/suites/rados/cephadm: enable mgr debugging
	cephadm: restart non-ceph daemons on reconfig
	mgr/cephadm/test_cephadm: fix expected output
	mgr/cephadm: fix remapping of hosts and services
	mgr/cephadm: add 'reconfig' service action
	cephadm: move mon creation config bits into mgr/cephadm
	cephadm: fix bootstrap message 'ssh' -> 'cephadm'
	cephadm: add --reconfig option for 'deploy'
	mgr/orchestrator: drop 'reload' service[-instance] action

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

f3d26fa9058d58a7f00cd2eb3394de81da8dcc9b