From: Sage Weil <sage@newdream.net>
Date: Fri, 16 Apr 2021 15:30:05 +0000 (-0500)
Subject: qa/tasks/cephadm: use yaml.dump_all()
X-Git-Tag: v16.2.2~1^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5292fe093dc774d55dcda2318dc4f1f111651fb;p=ceph.git

qa/tasks/cephadm: use yaml.dump_all()

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 97c143c3442e96b36de075ea7eefd6e17ede67bd)
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 15380088ca93..4b0d26b228a3 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', '-'],