mgr/cephadm: change SPDK RPC fields in nvmeof configuration

Fixes https://tracker.ceph.com/issues/67629

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

diff --git a/src/pybind/mgr/cephadm/services/nvmeof.py b/src/pybind/mgr/cephadm/services/nvmeof.py
index 5ba966231d2572ce1ddff5894f811e785dfbb364..fd277328db47f025d10d6bd1b61e408784d31c04 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nvmeof.py
+++ b/src/pybind/mgr/cephadm/services/nvmeof.py
@@ -53,8 +53,7 @@ class NvmeofService(CephService):
             'addr': host_ip,
             'port': spec.port,
             'spdk_protocol_log_level': 'WARNING',
-            'rpc_socket_dir': '/var/tmp/',
-            'rpc_socket_name': 'spdk.sock',
+            'rpc_socket': '/var/tmp/spdk.sock',
             'transport_tcp_options': transport_tcp_options,
             'rados_id': rados_id
         }

diff --git a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
index 5e296460ab3ab380f24100c3461d484a373b1ceb..3d80cfbdb6f8edcc2dcc8346279a14d06ca21b27 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
@@ -48,8 +48,7 @@ root_ca_cert = /root.ca.cert
 
 [spdk]
 tgt_path = {{ spec.tgt_path }}
-rpc_socket_dir = {{ spec.rpc_socket_dir }}
-rpc_socket_name = {{ spec.rpc_socket_name }}
+rpc_socket = {{ spec.rpc_socket }}
 timeout = {{ spec.spdk_timeout }}
 bdevs_per_cluster = {{ spec.bdevs_per_cluster }}
 log_level={{ spec.spdk_log_level }}

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index c7f795a1c033eaf2dd39b9ca5199140fb220c1f4..7cc6511025be457359943148e58f296ba04cd452 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -437,8 +437,7 @@ root_ca_cert = /root.ca.cert
 
 [spdk]
 tgt_path = /usr/local/bin/nvmf_tgt
-rpc_socket_dir = /var/tmp/
-rpc_socket_name = spdk.sock
+rpc_socket = /var/tmp/spdk.sock
 timeout = 60.0
 bdevs_per_cluster = 32
 log_level=