Merge branch 'main' into seastore-cephadm

Signed-off-by: Svelar <sunrongqi@huawei.com>

diff --cc src/cephadm/cephadm.py
Simple merge

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

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

diff --cc src/python-common/ceph/deployment/drive_group.py
Simple merge