From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 21 Mar 2013 15:38:52 +0000 (+0100)
Subject: config.py: remove get_file() use misc.get_file() instead
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77748e0da11e29c641ea71d15deffb927e4fba42;p=ceph-deploy.git

config.py: remove get_file() use misc.get_file() instead

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/ceph_deploy/config.py b/ceph_deploy/config.py
index 6dba8b8..ae8aa48 100644
--- a/ceph_deploy/config.py
+++ b/ceph_deploy/config.py
@@ -4,6 +4,7 @@ from cStringIO import StringIO
 
 from . import exc
 from . import conf
+from . import misc
 from .cliutil import priority
 
 LOG = logging.getLogger(__name__)
@@ -36,16 +37,6 @@ def config_push(args):
         raise exc.GenericError('Failed to config %d hosts' % errors)
 
 
-def get_file(path):
-    """
-    Run on mon node, grab a file.
-    """
-    try:
-        with file(path, 'rb') as f:
-            return f.read()
-    except IOError:
-        pass
-
 def config_pull(args):
     import os.path
 
@@ -57,7 +48,7 @@ def config_pull(args):
         try:
             LOG.debug('Checking %s for %s', hostname, frompath)
             sudo = args.pushy('ssh+sudo:{hostname}'.format(hostname=hostname))
-            get_file_r = sudo.compile(get_file)
+            get_file_r = sudo.compile(misc.get_file)
             conf_file = get_file_r(path=frompath)
             if conf_file is not None:
                 LOG.debug('Got %s from %s', frompath, hostname)