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 103ef2f031afcfb56080ff7b34cc4dfba7b6e50a..cc1320ec19ead596f0060fba44b2abd94555a025 100644 (file)
--- 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))