Merge pull request #52691 from adk3798/nvme-of-cleanup

mgr/cephadm: nvme-of follow up work

Reviewed-by: John Mulligan <jmulligan@redhat.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_services.py
Simple merge