Merge PR #33870 into octopus

* refs/pull/33870/head:
	mgr/cephadm: fix redeploy for the crash daemon
	cephadm: prefer config/keyring args
	cephadm: raise Error when no config/keyring
	cephadm: consolidate logic for reading `config-json`
	cephadm: merge `--config-and-keyring` and `--config-json` args

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

diff --cc src/cephadm/cephadm
Simple merge

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