From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 25 Nov 2013 19:57:52 +0000 (-0600)
Subject: remove another function in favor of new 'which' helper
X-Git-Tag: v1.3.3~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F140%2Fhead;p=ceph-deploy.git

remove another function in favor of new 'which' helper

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index 1c29684..bfd08fc 100644
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -11,18 +11,6 @@ from .lib.remoto import process
 LOG = logging.getLogger(__name__)
 
 
-def ceph_is_installed(conn):
-    """
-    Check if the ceph packages are installed by looking for the
-    presence of the ceph command.
-    """
-    stdout, stderr, return_code = process.check(
-        conn,
-        ['which', 'ceph'],
-    )
-    return not return_code
-
-
 def install(args):
     version = getattr(args, args.version_kind)
     version_str = args.version_kind
@@ -118,7 +106,8 @@ def purge_data(args):
     installed_hosts = []
     for hostname in args.host:
         distro = hosts.get(hostname, username=args.username)
-        if ceph_is_installed(distro.conn):
+        ceph_is_installed = distro.conn.remote_module.which('ceph')
+        if ceph_is_installed:
             installed_hosts.append(hostname)
         distro.conn.exit()