diff options
Diffstat (limited to 'ufo/gluster/swift/common/Glusterfs.py')
| -rw-r--r-- | ufo/gluster/swift/common/Glusterfs.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/ufo/gluster/swift/common/Glusterfs.py b/ufo/gluster/swift/common/Glusterfs.py index ce2c8e1..460956a 100644 --- a/ufo/gluster/swift/common/Glusterfs.py +++ b/ufo/gluster/swift/common/Glusterfs.py @@ -24,7 +24,6 @@ from gluster.swift.common.fs_utils import mkdirs # _fs_conf = ConfigParser() MOUNT_IP = 'localhost' -REMOTE_CLUSTER = False OBJECT_ONLY = False RUN_DIR='/var/run/swift' SWIFT_DIR = '/etc/swift' @@ -34,10 +33,6 @@ if _fs_conf.read(os.path.join('/etc/swift', 'fs.conf')): except (NoSectionError, NoOptionError): pass try: - REMOTE_CLUSTER = _fs_conf.get('DEFAULT', 'remote_cluster', False) in TRUE_VALUES - except (NoSectionError, NoOptionError): - pass - try: OBJECT_ONLY = _fs_conf.get('DEFAULT', 'object_only', "no") in TRUE_VALUES except (NoSectionError, NoOptionError): pass @@ -106,19 +101,12 @@ def unmount(full_mount_path): logging.error('Unable to unmount %s %s' % (full_mount_path, NAME)) def _get_export_list(): - if REMOTE_CLUSTER: - cmnd = 'gluster --remote-host=%s volume info' % MOUNT_IP - else: - cmnd = 'gluster volume info' + cmnd = 'gluster --remote-host=%s volume info' % MOUNT_IP export_list = [] if os.system(cmnd + ' >> /dev/null'): - if REMOTE_CLUSTER: - logging.error('Getting volume info failed for %s, make sure '\ - 'gluster --remote-host=%s works', NAME, MOUNT_IP) - else: - logging.error('Getting volume info failed for %s', NAME) + logging.error('Getting volume info failed for %s', NAME) else: fp = os.popen(cmnd) while True: |