tasks/ceph: make crush_setup() cluster-aware

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

diff --git a/tasks/ceph.py b/tasks/ceph.py
index 27c383cc461330bc71cc18b76586da31f9a14738..1329261fc8dfd4a3ccff6f9d3e245c0743376979 100644 (file)
--- a/tasks/ceph.py
+++ b/tasks/ceph.py
@@ -258,13 +258,15 @@ def valgrind_post(ctx, config):
 
 @contextlib.contextmanager
 def crush_setup(ctx, config):
-    first_mon = teuthology.get_first_mon(ctx, config)
+    cluster_name = config['cluster']
+    first_mon = teuthology.get_first_mon(ctx, config, cluster_name)
     (mon_remote,) = ctx.cluster.only(first_mon).remotes.iterkeys()
 
     profile = config.get('crush_tunables', 'default')
     log.info('Setting crush tunables to %s', profile)
     mon_remote.run(
-        args=['sudo', 'ceph', 'osd', 'crush', 'tunables', profile])
+        args=['sudo', 'ceph', '--cluster', cluster_name,
+              'osd', 'crush', 'tunables', profile])
     yield