From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 21 Mar 2013 15:40:19 +0000 (+0100)
Subject: discover.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=fb26ad40589e77c05429a96d19063cda225848cf;p=ceph-deploy.git

discover.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/discover.py b/ceph_deploy/discover.py
index a6b8755..5b35ead 100644
--- a/ceph_deploy/discover.py
+++ b/ceph_deploy/discover.py
@@ -1,22 +1,13 @@
 import logging
 import os.path
 
+from . import misc
 from .cliutil import priority
 
 
 LOG = logging.getLogger(__name__)
 
 
-def get_file(path):
-    """
-    Run on remote node, grab a file.
-    """
-    try:
-        with file(path, 'rb') as f:
-            return f.read()
-    except IOError:
-        pass
-
 def fetch_file(args, frompath, topath, hosts):
     # mon.
     if os.path.exists(topath):
@@ -26,7 +17,7 @@ def fetch_file(args, frompath, topath, hosts):
         for hostname in hosts:
             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)
             key = get_file_r(path=frompath.format(hostname=hostname))
             if key is not None:
                 LOG.debug('Got %s from %s, writing locally', topath, hostname)