mgr/cephadm: Make the discovery and gateway IPs configurable in NVMEof configuration

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

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 b91427dcace0f1d142da143b429b6231cc0690fe..2ceb6208fce477841a252eabda91f96f7d24e327 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nvmeof.py
+++ b/src/pybind/mgr/cephadm/services/nvmeof.py
@@ -47,10 +47,17 @@ class NvmeofService(CephService):
         transport_tcp_options = json.dumps(spec.transport_tcp_options) if spec.transport_tcp_options else None
         name = '{}.{}'.format(utils.name_to_config_section('nvmeof'), nvmeof_gw_id)
         rados_id = name[len('client.'):] if name.startswith('client.') else name
+        addr = host_ip
+        discovery_addr = host_ip
+        if spec.addr and spec.addr != "0.0.0.0":
+            addr = spec.addr
+        if spec.discovery_addr and spec.discovery_addr != "0.0.0.0":
+            discovery_addr = spec.discovery_addr
         context = {
             'spec': spec,
             'name': name,
-            'addr': host_ip,
+            'addr': addr,
+            'discovery_addr': discovery_addr,
             'port': spec.port,
             'spdk_log_level': 'WARNING',
             'rpc_socket_dir': '/var/tmp/',

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 644ca586ba93f418924b1ff71102ecc1e3ca2e9b..dbe29004771ad4449377f25000e39b7a6649c1db 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
@@ -32,7 +32,7 @@ max_log_directory_backups = {{ spec.max_log_directory_backups }}
 log_directory = {{ spec.log_directory }}
 
 [discovery]
-addr = {{ addr }}
+addr = {{ discovery_addr }}
 port = {{ spec.discovery_port }}
 
 [ceph]