]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Fix check_ip_port to work with IPv6 34350/head
authorRicardo Marques <rimarques@suse.com>
Wed, 25 Mar 2020 15:06:17 +0000 (15:06 +0000)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 1 Apr 2020 15:29:00 +0000 (17:29 +0200)
Fixes: https://tracker.ceph.com/issues/43816
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit b000f12abac9e11fe10da6f2745ad994d49ee034)

src/cephadm/cephadm

index baccd7c050514e5385cab8f8af7d5f7636424dd6..38a1daf44ddddcbf1541cc47fc4db35a0872861a 100755 (executable)
@@ -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: