From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 7 Jul 2017 15:21:51 +0000 (-0400)
Subject: qa/tasks/ceph: supply cluster name to ceph CLI
X-Git-Tag: v12.1.1~113^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16212%2Fhead;p=ceph.git

qa/tasks/ceph: supply cluster name to ceph CLI

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 23e01f23b9ed..1eaab1f1a4e9 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1121,38 +1121,24 @@ def run_daemon(ctx, config, type_):
                 try:
                     remote.run(
                         args=[
-                            'sudo',
-                            'ceph',
-                            'osd',
-                            'new',
-                            osd_uuid,
-                            id_,
+                            'sudo', 'ceph', '--cluster', cluster_name,
+                            'osd', 'new', osd_uuid, id_,
                         ]
                     )
                 except:
                     # fallback to pre-luminous
                     remote.run(
                         args=[
-                            'sudo',
-                            'ceph',
-                            'osd',
-                            'create',
-                            osd_uuid,
-                            id_,
+                            'sudo', 'ceph', '--cluster', cluster_name,
+                            'osd', 'create', osd_uuid, id_,
                         ]
                     )
                 if config.get('add_osds_to_crush'):
                     remote.run(
                         args=[
-                            'sudo',
-                            'ceph',
-                            'osd',
-                            'crush',
-                            'create-or-move',
-                            'osd.' + id_,
-                            '1.0',
-                            'host=localhost',
-                            'root=default',
+                            'sudo', 'ceph', '--cluster', cluster_name,
+                            'osd', 'crush', 'create-or-move', 'osd.' + id_,
+                            '1.0', 'host=localhost', 'root=default',
                         ]
                     )