From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 23 Mar 2016 23:48:53 +0000 (-0700)
Subject: tasks/ceph: store cluster config in a per-cluster dict
X-Git-Tag: v11.1.1~58^2^2~212^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0acbafe3719e773a670aece2ba578f72100a4e31;p=ceph.git

tasks/ceph: store cluster config in a per-cluster dict

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/tasks/ceph.py b/tasks/ceph.py
index 792b4dbe5081..13022969402a 100644
--- a/tasks/ceph.py
+++ b/tasks/ceph.py
@@ -429,8 +429,10 @@ def cluster(ctx, config):
     if config.get('tmpfs_journal'):
         conf['journal dio'] = False
 
-    ctx.ceph = argparse.Namespace()
-    ctx.ceph.conf = conf
+    if not hasattr(ctx, 'ceph'):
+        ctx.ceph = {}
+    ctx.ceph[cluster_name] = argparse.Namespace()
+    ctx.ceph[cluster_name].conf = conf
 
     default_keyring = '/etc/ceph/{cluster}.keyring'.format(cluster=cluster_name)
     keyring_path = config.get('keyring_path', default_keyring)