From d5292fe093dc774d55dcda2318dc4f1f111651fb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 16 Apr 2021 10:30:05 -0500 Subject: [PATCH] qa/tasks/cephadm: use yaml.dump_all() Signed-off-by: Sage Weil (cherry picked from commit 97c143c3442e96b36de075ea7eefd6e17ede67bd) --- qa/tasks/cephadm.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 15380088ca937..4b0d26b228a3e 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -1002,11 +1002,9 @@ def apply(ctx, config): cluster_name = config.get('cluster', 'ceph') specs = config.get('specs', []) - y = '\n---\n'.join(map(yaml.dump, specs)) + y = subst_vip(ctx, yaml.dump_all(specs)) - y = subst_vip(ctx, y) - - log.info(f'Applying spec:\n{y}') + log.info(f'Applying spec(s):\n{y}') _shell( ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote, ['ceph', 'orch', 'apply', '-i', '-'], -- 2.39.5