Merge pull request ceph#59362 from gbregman/main

mgr/cephadm: change SPDK RPC fields in nvmeof configuration

Author: gbregman

src/pybind/mgr/cephadm/services/nvmeof.py

@@ -53,8 +53,7 @@ def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonD
             '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
         }

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 }}

src/pybind/mgr/cephadm/tests/test_services.py

@@ -437,8 +437,7 @@ def test_nvmeof_config(self, _get_name, _run_cephadm, cephadm_module: CephadmOrc
 
 [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=

src/python-common/ceph/deployment/service_spec.py

@@ -1340,8 +1340,7 @@ def __init__(self,
                  spdk_timeout: Optional[float] = 60.0,
                  spdk_log_level: Optional[str] = '',
                  spdk_protocol_log_level: Optional[str] = 'WARNING',
-                 rpc_socket_dir: Optional[str] = '/var/tmp/',
-                 rpc_socket_name: Optional[str] = 'spdk.sock',
+                 rpc_socket: Optional[str] = '/var/tmp/spdk.sock',
                  conn_retries: Optional[int] = 10,
                  transports: Optional[str] = 'tcp',
                  transport_tcp_options: Optional[Dict[str, int]] =
@@ -1430,10 +1429,8 @@ def __init__(self,
         self.spdk_log_level = spdk_log_level
         #: ``spdk_protocol_log_level`` the SPDK-GW protocol log level
         self.spdk_protocol_log_level = spdk_protocol_log_level or 'WARNING'
-        #: ``rpc_socket_dir`` the SPDK socket file directory
-        self.rpc_socket_dir = rpc_socket_dir or '/var/tmp/'
-        #: ``rpc_socket_name`` the SPDK socket file name
-        self.rpc_socket_name = rpc_socket_name or 'spdk.sock'
+        #: ``rpc_socket`` the SPDK RPC socket file path
+        self.rpc_socket = rpc_socket or '/var/tmp/spdk.sock'
         #: ``conn_retries`` ceph connection retries number
         self.conn_retries = conn_retries
         #: ``transports`` tcp