From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Dec 2019 16:16:57 +0000 (+0000)
Subject: qa/tasks/cephadm: set .conf to cluster config object
X-Git-Tag: v15.1.0~390^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=31ba596a63751c917f10d375d5dda11020a85751;p=ceph.git

qa/tasks/cephadm: set .conf to cluster config object

ceph.py does this and ceph_manager.py kill_osd relies on it.

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

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 01bf8fe1df7..49cdb359c2f 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -297,6 +297,7 @@ def ceph_bootstrap(ctx, config):
             path='{}/seed.{}.conf'.format(testdir, cluster_name),
             data=conf_fp.getvalue())
         log.debug('Final config:\n' + conf_fp.getvalue())
+        ctx.ceph[cluster_name].conf = seed_config
 
         # bootstrap
         log.info('Bootstrapping...')