From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2020 20:38:43 +0000 (-0600)
Subject: qa/tasks/cephadm: pass apply placement as a single arg
X-Git-Tag: v15.1.1~74^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e764e1a36b2da49a337b7d726054055dc3eb175;p=ceph.git

qa/tasks/cephadm: pass apply placement as a single arg

Use ';' as a separator, although ' ' would also work.  ',' would not
when msgr v2 addrs are in use.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 4394a6c37959..0da100ca8322 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -538,7 +538,7 @@ def ceph_mgrs(ctx, config):
         if nodes:
             _shell(ctx, cluster_name, remote, [
                 'ceph', 'orch', 'apply', 'mgr',
-                str(len(nodes) + 1)] + nodes
+                str(len(nodes) + 1) + ';' + ';'.join(nodes)]
             )
         for mgr, i in daemons.items():
             remote, id_ = i
@@ -628,7 +628,7 @@ def ceph_mdss(ctx, config):
         _shell(ctx, cluster_name, remote, [
             'ceph', 'orch', 'apply', 'mds',
             'all',
-            str(len(nodes))] + nodes
+            str(len(nodes)) + ';' + ';'.join(nodes)]
         )
     for role, i in daemons.items():
         remote, id_ = i
@@ -663,7 +663,7 @@ def ceph_monitoring(daemon_type, ctx, config):
     if nodes:
         _shell(ctx, cluster_name, remote, [
             'ceph', 'orch', 'apply', daemon_type,
-            str(len(nodes))] + nodes
+            str(len(nodes)) + ';' + ';'.join(nodes)]
         )
     for role, i in daemons.items():
         remote, id_ = i
@@ -703,7 +703,7 @@ def ceph_rgw(ctx, config):
         _shell(ctx, cluster_name, remote, [
             'ceph', 'orch', 'apply', 'rgw',
             realm, zone,
-            str(len(nodes))] + nodes
+            str(len(nodes)) + ';' + ';'.join(nodes)]
         )
     for role, i in daemons.items():
         remote, id_ = i