From 6e764e1a36b2da49a337b7d726054055dc3eb175 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 4 Mar 2020 14:38:43 -0600 Subject: [PATCH] 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 --- qa/tasks/cephadm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 4394a6c3795..0da100ca832 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 -- 2.39.5