gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #52296 from asm0deuz/bz2153448_ipv6

Browse Source 
mgr/cephadm: ceph orch add fails when ipv6 address is surrounded by square brackets.

Reviewed-by: Adam King <adking@redhat.com>
This commit is contained in:
Adam King 2023-10-05 11:43:53 -04:00 committed by GitHub
commit 6c4ed58ab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pybind/mgr/orchestrator/module.py
View File

@ -19,6 +19,7 @@ from ceph.deployment.inventory import Device # noqa: F401; pylint: disable=unus
from ceph.deployment.drive_group import DriveGroupSpec, DeviceSelection, OSDMethod
from ceph.deployment.service_spec import PlacementSpec, ServiceSpec, service_spec_allow_invalid_from_json, TracingSpec
from ceph.deployment.hostspec import SpecValidationError
from ceph.deployment.utils import unwrap_ipv6
from ceph.utils import datetime_now
from mgr_util import to_pretty_timedelta, format_bytes
@ -479,6 +480,9 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
if labels and len(labels) == 1:
labels = labels[0].split(',')
if addr is not None:
addr = unwrap_ipv6(addr)
s = HostSpec(hostname=hostname, addr=addr, labels=labels, status=_status)
return self._apply_misc([s], False, Format.plain)