From 4c4aee6247badffe29deb8bf4f12eb95228ce0b1 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 19 Aug 2016 19:30:48 -0400 Subject: [PATCH] [RM-17086] osd: use load_raw for reading/writing ceph conf Signed-off-by: Alfredo Deza --- ceph_deploy/osd.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py index 7991298..bbd5eaf 100644 --- a/ceph_deploy/osd.py +++ b/ceph_deploy/osd.py @@ -7,11 +7,6 @@ import sys import time from textwrap import dedent -try: - from cStringIO import StringIO -except ImportError: - from io import StringIO - from ceph_deploy import conf, exc, hosts, mon from ceph_deploy.util import constants, system, packages from ceph_deploy.cliutil import priority @@ -305,11 +300,10 @@ def prepare(args, cfg, activate_prepared_disk): bootstrapped.add(hostname) LOG.debug('Deploying osd to %s', hostname) - conf_data = StringIO() - cfg.write(conf_data) + conf_data = conf.ceph.load_raw(args) distro.conn.remote_module.write_conf( args.cluster, - conf_data.getvalue(), + conf_data, args.overwrite_conf ) -- 2.47.3