From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Dec 2018 03:28:49 +0000 (-0600)
Subject: qa/tasks/ceph: only use monmaptool --addv if addr has [,:v]
X-Git-Tag: v14.1.0~484^2~42
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=241d402d7cf72d8fb466cdb758444b7c4f6a5dfc;p=ceph-ci.git

qa/tasks/ceph: only use monmaptool --addv if addr has [,:v]

Otherwise, we want the --add path, which has the logic to infer ports,
v2+v1, etc.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 103ef2f031a..cc1320ec19e 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -528,7 +528,7 @@ def create_simple_monmap(ctx, remote, conf, mons,
     ]
     for (name, addr) in addresses:
         n = name[4:]
-        if mon_bind_addrvec:
+        if mon_bind_addrvec and (',' in addr or 'v' in addr or ':' in addr):
             args.extend(('--addv', n, addr))
         else:
             args.extend(('--add', n, addr))