RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/mon: fix cluster support for monmap bootstrap

Browse Source 
-filter out mons from other clusters
-fix parsing of mon name from role

Fixes: http://tracker.ceph.com/issues/38115

Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2019-01-30 12:23:10 -05:00
parent 8d5ddb5817
commit 0aebb55af5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qa/tasks/ceph.py
View File

@ -419,7 +419,7 @@ def cephfs_setup(ctx, config):
yield
def get_mons(roles, ips,
def get_mons(roles, ips, cluster_name,
mon_bind_msgr2=False,
mon_bind_addrvec=False):
"""
@ -429,7 +429,7 @@ def get_mons(roles, ips,
v1_ports = {}
v2_ports = {}
mon_id = 0
is_mon = teuthology.is_type('mon')
is_mon = teuthology.is_type('mon', cluster_name)
for idx, roles in enumerate(roles):
for role in roles:
if not is_mon(role):
@ -528,8 +528,8 @@ def create_simple_monmap(ctx, remote, conf, mons,
]
if mon_bind_addrvec:
args.extend(['--enable-all-features'])
for (name, addr) in addresses:
n = name[4:]
for (role, addr) in addresses:
_, _, n = teuthology.split_role(role)
if mon_bind_addrvec and (',' in addr or 'v' in addr or ':' in addr):
args.extend(('--addv', n, addr))
else:
@ -652,7 +652,7 @@ def cluster(ctx, config):
ips = [host for (host, port) in
(remote.ssh.get_transport().getpeername() for (remote, role_list) in remotes_and_roles)]
mons = get_mons(
roles, ips,
roles, ips, cluster_name,
mon_bind_msgr2=config.get('mon_bind_msgr2'),
mon_bind_addrvec=config.get('mon_bind_addrvec'),
)