Merge PR #39931 into master

* refs/pull/39931/head:
	mgr/cephadm: fall back to service spec port if none on DaemonDescription
	mgr/cephadm: fix redeploy when daemons have ip:port
	mgr/cephadm/schedule: add test case
	qa/suites/rados/cephadm/smoke-roleless: add rgw test on many ports
	doc/cephadm/rgw: update docs to show count-per-host
	mgr/cephadm: add support for rgw_frontend_type (beast or civetweb)
	mgr/cephadm: remove ssl_frontend_ssl_key from RGWSpec
	mgr/cephadm: fix beast private key config option
	mgr/cephadm: fix rgw ssl cert/key config-key path
	mgr/cephadm/schedule: dynamically assign ports for rgw
	mgr/cephadm/schedule: only 1 port in DaemonPlacement
	mgr/cephadm: move rgw frontend logic into RgwService
	mgr/cephadm/schedule: return DaemonPlacement instead of HostPlacementSpec
	mgr/cephadm/schedule: remove unused methods
	mgr/cephadm: propagate ip:port from CephadmDaemoNDeploySpec to deployment
	cephadm: populate ports if known and not included in unit.meta
	mgr/cephadm: gather and report ports in 'orch ps' output

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

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

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