From: Josh Durgin <jdurgin@redhat.com>
Date: Fri, 18 Mar 2016 03:18:21 +0000 (-0700)
Subject: tasks/ceph: create a CephManager per cluster
X-Git-Tag: v10.2.6~165^2^2~72^2~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2f0551ef30a91d83c77edb0cf0ebeec64065d92;p=ceph.git

tasks/ceph: create a CephManager per cluster

Thrashings tasks will be updated to use ctx.managers indexed by
cluster later.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 25ff14af7421bfbb91c5e60f51fe6a6f924ec30e)
---

diff --git a/tasks/ceph.py b/tasks/ceph.py
index 4abd429f341f..792b4dbe5081 100644
--- a/tasks/ceph.py
+++ b/tasks/ceph.py
@@ -1470,10 +1470,12 @@ def task(ctx, config):
                 healthy(ctx=ctx, config=dict(cluster=config['cluster']))
             first_mon = teuthology.get_first_mon(ctx, config, config['cluster'])
             (mon,) = ctx.cluster.only(first_mon).remotes.iterkeys()
-            ctx.manager = CephManager(
+            if not hasattr(ctx, 'managers'):
+                ctx.managers = {}
+            ctx.managers[config['cluster']] = CephManager(
                 mon,
                 ctx=ctx,
-                logger=log.getChild('ceph_manager'),
+                logger=log.getChild('ceph_manager.' + config['cluster']),
             )
             yield
         finally: