Merge PR #33922 into octopus

* refs/pull/33922/head:
	qa/tasks/mgr/test_orchestrator_cli: adapt
	qa/suites/rados/cephadm/upgrade: start from compatible build
	mgr/cephadm: refine log message
	python-common: correctly dictify DriveGroupSpec objects when paths are used
	mgr/cephadm: adapt test_cephadm.sh to new syntax
	mgr/cephadm: adapt qa->test_cephadm.sh
	qa/tasks/cephadm: use 'orch daemon osd add'
	mgr/cephadm: adapt osd deployment to service_apply

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/_interface.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge