diff options
author | Danny Al-Gaaf <danny.al-gaaf@bisect.de> | 2013-03-19 21:58:22 +0100 |
---|---|---|
committer | Danny Al-Gaaf <danny.al-gaaf@bisect.de> | 2013-03-19 22:00:41 +0100 |
commit | c57daa3c6e03e8974e133d3a2d9bc3d6f06f4faf (patch) | |
tree | 0e81ed83e0f62033934d880578c03620b4b36961 | |
parent | 57dde5c8b18ff4ccd53a30bb94119c0ffceb52b7 (diff) | |
download | ceph-c57daa3c6e03e8974e133d3a2d9bc3d6f06f4faf.tar.gz |
ceph-disk: remove double defined function get_conf
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
-rwxr-xr-x | src/ceph-disk | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/ceph-disk b/src/ceph-disk index 3d5e94217cb..4d006eb3870 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, |