]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/ceph: store cluster config in a per-cluster dict
authorJosh Durgin <jdurgin@redhat.com>
Wed, 23 Mar 2016 23:48:53 +0000 (16:48 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 9 May 2016 18:51:58 +0000 (11:51 -0700)
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
tasks/ceph.py

index 792b4dbe50816600764ed253d1cf1e9d1d60eba5..13022969402abbca25dfde10107223ea30c19c16 100644 (file)
@@ -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)