From c93c2806382d4d680bd250f8611db6a230a48874 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 22 Dec 2020 19:25:48 -0500 Subject: [PATCH] qa/tasks/cephadm: include first mgr host when applying mgrs This prevents the first mgr from being shut down due to lack of appropriate placements. trivial fix: removed octopus upgrade configs. Signed-off-by: Josh Durgin Signed-off-by: Yuri Weinstein (cherry picked from commit c79fa6d780580f99b62117e54326a4ef4b7adfef) --- qa/tasks/cephadm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 43139274576..51cf7488eeb 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -583,10 +583,10 @@ def ceph_mgrs(ctx, config): for mgr in [r for r in roles if teuthology.is_type('mgr', cluster_name)(r)]: c_, _, id_ = teuthology.split_role(mgr) - if c_ == cluster_name and id_ == ctx.ceph[cluster_name].first_mgr: - continue log.info('Adding %s on %s' % (mgr, remote.shortname)) nodes.append(remote.shortname + '=' + id_) + if c_ == cluster_name and id_ == ctx.ceph[cluster_name].first_mgr: + continue daemons[mgr] = (remote, id_) if nodes: _shell(ctx, cluster_name, remote, [ -- 2.47.3