]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
[RM-17086] osd: use load_raw for reading/writing ceph conf 416/head
authorAlfredo Deza <adeza@redhat.com>
Fri, 19 Aug 2016 23:30:48 +0000 (19:30 -0400)
committerAlfredo Deza <adeza@redhat.com>
Fri, 19 Aug 2016 23:30:48 +0000 (19:30 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ceph_deploy/osd.py

index 79912983fe04513c2ed097c87a82772da948251b..bbd5eaf8f80bab2cfc4f2f905784c49a72be83da 100644 (file)
@@ -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
                 )