Merge PR #68086 into tentacle

* refs/pull/68086/head:
	mgr/cephadm: Add KMIP server support for NVMeoF gateway

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Reviewed-by: Tomer Haskalovitch <tomer.haska@ibm.com>

diff --cc src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
Simple merge

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

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