From 85dfc6f4a93dd238a0d56fa49f1b5bdd4417acb7 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 16 Jun 2021 14:20:38 -0600 Subject: [PATCH] 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 --- src/cephadm/cephadm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 8b77b787d2ff..7f9daba5638d 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -3492,7 +3492,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: -- 2.47.3