Skip to content

Commit 62a4247

Browse files
author
Alexander Indenbaum
committed
pybind/mgr/cephadm/services/nvmeof.py: allow setting '0.0.0.0' as address in the spec file
- Partial revert of ceph@9eb3b99 - Part of ceph#59738 Signed-off-by: Alexander Indenbaum <aindenba@redhat.com>
1 parent 31a5e2f commit 62a4247

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,8 @@ def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonD
4747
transport_tcp_options = json.dumps(spec.transport_tcp_options) if spec.transport_tcp_options else None
4848
name = '{}.{}'.format(utils.name_to_config_section('nvmeof'), nvmeof_gw_id)
4949
rados_id = name[len('client.'):] if name.startswith('client.') else name
50-
addr = host_ip
51-
discovery_addr = host_ip
52-
if spec.addr and spec.addr != "0.0.0.0":
53-
addr = spec.addr
54-
if spec.discovery_addr and spec.discovery_addr != "0.0.0.0":
55-
discovery_addr = spec.discovery_addr
50+
addr = spec.addr or host_ip
51+
discovery_addr = spec.discovery_addr or host_ip
5652
context = {
5753
'spec': spec,
5854
'name': name,

0 commit comments

Comments
 (0)