From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 19 Aug 2016 23:30:48 +0000 (-0400)
Subject: [RM-17086] osd: use load_raw for reading/writing ceph conf
X-Git-Tag: v1.5.36~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F416%2Fhead;p=ceph-deploy.git

[RM-17086] osd: use load_raw for reading/writing ceph conf

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

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
                 )