Merge PR #33772 into master

* refs/pull/33772/head:
	mgr/cephadm: upgrade all ceph daemon types
	mgr/cephadm: do not specify --image arg for non-ceph daemons; fix upgrade
	mgr/cephadm: fix error-path return values for _run_cephadm
	mgr/orch: fix RGWSpec loading
	mgr/cephadm: fix 'orch rm'

Reviewed-by: Joshua Schmid <jschmid@suse.de>

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

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