From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 19 Mar 2013 20:58:22 +0000 (+0100)
Subject: ceph-disk: remove double defined function get_conf
X-Git-Tag: v0.62~188^2~1^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c57daa3c6e03e8974e133d3a2d9bc3d6f06f4faf;p=ceph.git

ceph-disk: remove double defined function get_conf

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

diff --git a/src/ceph-disk b/src/ceph-disk
index 3d5e94217cb0..4d006eb38702 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -349,7 +349,7 @@ def get_conf(cluster, variable):
     try:
         p = subprocess.Popen(
             args=[
-                'ceph-conf',
+                '/usr/bin/ceph-conf',
                 '--cluster={cluster}'.format(
                     cluster=cluster,
                     ),
@@ -1210,37 +1210,6 @@ def detect_fstype(
     return fstype
 
 
-def get_conf(cluster, variable):
-    try:
-        p = subprocess.Popen(
-            args=[
-                '/usr/bin/ceph-conf',
-                '--cluster={cluster}'.format(
-                    cluster=cluster,
-                    ),
-                '--name=osd.',
-                '--lookup',
-                variable,
-                ],
-            stdout=subprocess.PIPE,
-            close_fds=True,
-            )
-    except OSError as e:
-        raise Error('error executing ceph-conf', e)
-    (out, _err) = p.communicate()
-    ret = p.wait()
-    if ret == 1:
-        # config entry not found
-        return None
-    elif ret != 0:
-        raise Error('getting variable from configuration failed')
-    value = out.split('\n', 1)[0]
-    # don't differentiate between "var=" and no var set
-    if not value:
-        return None
-    return value
-
-
 def mount(
     dev,
     fstype,