From 241d402d7cf72d8fb466cdb758444b7c4f6a5dfc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 18 Dec 2018 21:28:49 -0600 Subject: [PATCH] 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 --- qa/tasks/ceph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 103ef2f031afc..cc1320ec19ead 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)) -- 2.39.5