From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 5 Nov 2019 18:10:15 +0000 (+0100)
Subject: qa/tasks/ceph.py: pass cluster_name to get_mons
X-Git-Tag: v13.2.7~8^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1382cb38be8b05c56e7ea65e651a6ebf0fd443d9;p=ceph.git

qa/tasks/ceph.py: pass cluster_name to get_mons

This cannot be cherry-picked from master because it fixes an issue that was
introduced directly into mimic by a bad backport.

Fixes: 276c2b80fd9ce58c5249001bfc98fd84249782cb
Fixes: https://tracker.ceph.com/issues/42658
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 08ab07f8d60..0fcc2cc9010 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -383,14 +383,14 @@ def cephfs_setup(ctx, config):
     yield
 
 
-def get_mons(roles, ips):
+def get_mons(roles, ips, cluster_name):
     """
     Get monitors and their associated addresses
     """
     mons = {}
     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):
@@ -590,7 +590,7 @@ def cluster(ctx, config):
     roles = [role_list for (remote, role_list) in remotes_and_roles]
     ips = [host for (host, port) in
            (remote.ssh.get_transport().getpeername() for (remote, role_list) in remotes_and_roles)]
-    mons = get_mons(roles, ips)
+    mons = get_mons(roles, ips, cluster_name)
     conf = skeleton_config(
         ctx, roles=roles, ips=ips, mons=mons, cluster=cluster_name,
     )