tasks/ceph_manager: add cluster param to write_conf()

Only used by cephfs right now, so don't bother changing callers.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/tasks/ceph.py b/tasks/ceph.py
index 595ac3515919b0db9e6999f52029a95b45e9b466..b10d50f9e6a8d6f92df22fd0833f77c2d7888663 100644 (file)
--- a/tasks/ceph.py
+++ b/tasks/ceph.py
@@ -489,7 +489,7 @@ def cluster(ctx, config):
     default_conf_path = '/etc/ceph/{cluster}.conf'.format(cluster=cluster_name)
     conf_path = config.get('conf_path', default_conf_path)
     log.info('Writing %s for FSID %s...' % (conf_path, fsid))
-    write_conf(ctx, conf_path)
+    write_conf(ctx, conf_path, cluster_name)
 
     log.info('Creating admin key on %s...' % firstmon)
     ctx.cluster.only(firstmon).run(

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index 1d3a10485aaea7f5f8036ece2467c233405454c0..6d1e6295355f65b0b12b869609ad73f4ae33d1d2 100644 (file)
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -27,9 +27,9 @@ DEFAULT_CONF_PATH = '/etc/ceph/ceph.conf'
 log = logging.getLogger(__name__)
 
 
-def write_conf(ctx, conf_path=DEFAULT_CONF_PATH):
+def write_conf(ctx, conf_path=DEFAULT_CONF_PATH, cluster='ceph'):
     conf_fp = StringIO()
-    ctx.ceph.conf.write(conf_fp)
+    ctx.ceph[cluster].conf.write(conf_fp)
     conf_fp.seek(0)
     writes = ctx.cluster.run(
         args=[