]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephadm: use yaml.dump_all()
authorSage Weil <sage@newdream.net>
Fri, 16 Apr 2021 15:30:05 +0000 (10:30 -0500)
committerSage Weil <sage@newdream.net>
Fri, 16 Apr 2021 15:30:05 +0000 (10:30 -0500)
Signed-off-by: Sage Weil <sage@newdream.net>
qa/tasks/cephadm.py

index 15380088ca93781111b50aacef6819c14e5b63ad..4b0d26b228a3e3902e8e7b530c4c705a0016de61 100644 (file)
@@ -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', '-'],