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>
This commit is contained in:
Sage Weil 2018-12-18 21:28:49 -06:00
parent ac2430a43d
commit 241d402d7c

View File

@ -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))