From: Sage Weil <sage@newdream.net>
Date: Fri, 14 May 2021 15:36:05 +0000 (-0500)
Subject: qa/tasks/cephadm: clean up ctx.manager setup
X-Git-Tag: v17.1.0~1921^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=267cefc0401d078e247d387d93a60840f6b53978;p=ceph.git

qa/tasks/cephadm: clean up ctx.manager setup

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 37a9335b33be..76ee7f3c8717 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1340,7 +1340,6 @@ def task(ctx, config):
     # set up cluster context
     if not hasattr(ctx, 'ceph'):
         ctx.ceph = {}
-        ctx.managers = {}
     if 'cluster' not in config:
         config['cluster'] = 'ceph'
     cluster_name = config['cluster']
@@ -1412,6 +1411,8 @@ def task(ctx, config):
             lambda: ceph_clients(ctx=ctx, config=config),
             lambda: create_rbd_pool(ctx=ctx, config=config),
     ):
+        if not hasattr(ctx, 'managers'):
+            ctx.managers = {}
         ctx.managers[cluster_name] = CephManager(
             ctx.ceph[cluster_name].bootstrap_remote,
             ctx=ctx,