Commit Graph

4 Commits

Author SHA1 Message Date
Sage Weil
f3d26fa905 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>
2019-12-23 15:59:20 -06:00
Sage Weil
40b70c632d cephadm: move mon creation config bits into mgr/cephadm
There's no need for mgr/cephadm to pass --mon-* arguments to
/usr/bin/cephadm just so it can add bits to the config file when the
config file is also being passed in from mgr/cephadm.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-22 10:50:23 -06:00
Sage Weil
d61066804a test_cephadm.sh: pass --fsid to shell command
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-22 08:48:50 -06:00
Sage Weil
137fa64e12 qa: rename ceph-daemon tests -> cephadm
Also move the workunit to a better location.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00