Merge pull request ceph#52296 from asm0deuz/bz2153448_ipv6

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

Reviewed-by: Adam King <[email protected]>

src/pybind/mgr/orchestrator/module.py

@@ -19,6 +19,7 @@
 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 @@ def _add_host(self,
         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)