From 0cdee0b677440f8dde863b8bb430de7d25a6bbd2 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 3 Jun 2021 15:45:17 +0200
Subject: [PATCH] start_mon: fix mon addition with ipv6

When bootstrapping a new monitor using ipv6 address with v2+v1 protocol
this command fails because of the brackets wrapping the ipv6 address:

```
++/opt/ceph-container/bin/start_mon.sh:172: start_mon(): ceph-conf -c /etc/ceph/ceph.conf 'mon host'
++/opt/ceph-container/bin/start_mon.sh:172: start_mon(): tr , '\n'
++/opt/ceph-container/bin/start_mon.sh:172: start_mon(): grep -c '[2620:52:0:880:225:90ff:fefc:1a98]'
+/opt/ceph-container/bin/start_mon.sh:172: start_mon(): v2v1=10
+/opt/ceph-container/bin/start_mon.sh:174: start_mon(): '[' 10 -eq 2 ']'
+/opt/ceph-container/bin/start_mon.sh:178: start_mon(): timeout 7 ceph --cluster ceph mon add magna115 '[2620:52:0:880:225:90ff:fefc:1a98]:3300'
```

eg:
```
[root@magna115 ~]# ceph-conf -c /etc/ceph/ceph.conf 'mon host' | tr ',' '\n' | tr -d '[]' | grep "[2620:52:0:880:225:90ff:fefc:1a98]"
v2:2620:52:0:880:225:90ff:fefc:26d2:3300
v1:2620:52:0:880:225:90ff:fefc:26d2:6789
v2:2620:52:0:880:225:90ff:fefc:1cca:3300
v1:2620:52:0:880:225:90ff:fefc:1cca:6789
v2:2620:52:0:880:225:90ff:fefb:d5ae:3300
v1:2620:52:0:880:225:90ff:fefb:d5ae:6789
v2:2620:52:0:880:225:90ff:fefb:d634:3300
v1:2620:52:0:880:225:90ff:fefb:d634:6789
v2:2620:52:0:880:225:90ff:fefc:1a98:3300
v1:2620:52:0:880:225:90ff:fefc:1a98:6789
```

it matches 10 occurences where it should match only 2.

eg:
```
[root@magna115 ~]# ceph-conf -c /etc/ceph/ceph.conf 'mon host' | tr ',' '\n' | grep "2620:52:0:880:225:90ff:fefc:1a98"
[v2:[2620:52:0:880:225:90ff:fefc:1a98]:3300
v1:[2620:52:0:880:225:90ff:fefc:1a98]:6789]
[root@magna115 ~]#
```

the consequence is that we don't enter in the right condition so it adds
the new monitor with v2 only syntax into the monitor map.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1967493

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 24e1f91422e837c50a9ec6a5df6b746de1bfb099)
---
 src/daemon/start_mon.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/daemon/start_mon.sh b/src/daemon/start_mon.sh
index 75e4edb6d..ec1b128d0 100755
--- a/src/daemon/start_mon.sh
+++ b/src/daemon/start_mon.sh
@@ -169,10 +169,11 @@ function start_mon {
       ceph-mon --setuser ceph --setgroup ceph --cluster "${CLUSTER}" -i "${MON_NAME}" --inject-monmap "$MONMAP" --keyring "$MON_KEYRING" --mon-data "$MON_DATA_DIR"
     fi
     if [[ "$CEPH_DAEMON" != demo ]]; then
-      v2v1=$(ceph-conf -c /etc/ceph/"${CLUSTER}".conf 'mon host' | tr ',' '\n' | grep -c "${MON_IP}")
+      MON_IP_NO_BRACKETS=$(echo "$MON_IP" | tr -d '[]')
+      v2v1=$(ceph-conf -c /etc/ceph/"${CLUSTER}".conf 'mon host' | tr ',' '\n' | grep -c "${MON_IP_NO_BRACKETS}")
       # in case of v2+v1 configuration : [v2:xxxx:3300,v1:xxxx:6789]
       if [ "${v2v1}" -eq 2 ]; then
-        timeout 7 ceph "${CLI_OPTS[@]}" mon add "${MON_NAME}" "${MON_IP}" || true
+        timeout 7 ceph "${CLI_OPTS[@]}" mon add "${MON_NAME}" "${MON_IP_NO_BRACKETS}" || true
       # with v2 only : [v2:xxxx:3300]
       else
         timeout 7 ceph "${CLI_OPTS[@]}" mon add "${MON_NAME}" "${MON_IP}":"${MON_PORT}" || true