From: Ricardo Marques <rimarques@suse.com>
Date: Wed, 25 Mar 2020 15:06:17 +0000 (+0000)
Subject: cephadm: Fix check_ip_port to work with IPv6
X-Git-Tag: v15.2.2~75^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98b2803de93e9955e9f60dddd7fd9d1d328c5b78;p=ceph.git

cephadm: Fix check_ip_port to work with IPv6

Fixes: https://tracker.ceph.com/issues/43816

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit b000f12abac9e11fe10da6f2745ad994d49ee034)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index baccd7c0505..38a1daf44dd 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -366,6 +366,8 @@ def check_ip_port(ip, port):
         logger.info('Verifying IP %s port %d ...' % (ip, port))
         if ip.startswith('[') or '::' in ip:
             s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+            if ip.startswith('[') and ip.endswith(']'):
+                ip = ip[1:-1]
         else:
             s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try: