From: Michael Fritch <mfritch@suse.com>
Date: Wed, 16 Jun 2021 20:20:38 +0000 (-0600)
Subject: cephadm: fix regexp to strip `v1:` or `v2:` prefix from IPv6 addr
X-Git-Tag: v16.2.6~54^2~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4020e4f2e12061790a69efec06a79610ef826a76;p=ceph.git

cephadm: fix regexp to strip `v1:` or `v2:` prefix from IPv6 addr

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)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 92bb8d617823..d3f83950d406 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -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: