]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix regexp to strip `v1:` or `v2:` prefix from IPv6 addr
authorMichael Fritch <mfritch@suse.com>
Wed, 16 Jun 2021 20:20:38 +0000 (14:20 -0600)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 10 Aug 2021 14:31:20 +0000 (16:31 +0200)
regexp was striping the first hextet of the IPv6 address:

```
FAILED tests/test_cephadm.py::TestBootstrap::test_mon_addrv[[0000:0000:0000:0000:0000:FFFF:C0A8:0101:1234]-list_networks5-None] - cephadm.Error: Cannot infer CIDR network for mon IP `0000:0000:0000:0000:FFFF:C0A8:0101`: pass --skip-mon-network to configure it later
```

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 85dfc6f4a93dd238a0d56fa49f1b5bdd4417acb7)

src/cephadm/cephadm

index 92bb8d617823751002bfa69a66de8852c3708b7e..d3f83950d406000a96c7d019c35690232aef65e5 100755 (executable)
@@ -3466,7 +3466,7 @@ def prepare_mon_addresses(
                             addr_arg)
             port = int(hasport[0])
             # strip off v1: or v2: prefix
-            addr = re.sub(r'^\w+:', '', addr)
+            addr = re.sub(r'^v\d+:', '', addr)
             base_ip = addr[0:-(len(str(port))) - 1]
             check_ip_port(ctx, base_ip, port)
     else: