valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tuple element to be int

Browse Source
This commit is contained in:
Martin Polreich 2018-06-27 14:25:11 +02:00
parent 943aab185d
commit 1733492da1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/glusterfs.py
View File

@ -36,7 +36,8 @@ def _get_version():
result = __salt__['cmd.run'](cmd).splitlines() result = __salt__['cmd.run'](cmd).splitlines()
for line in result: for line in result:
if line.startswith('glusterfs'): if line.startswith('glusterfs'):
version = line.split()[1].split('.') version = line.split()[-1].split('.')
version = [int(i) for i in version]
return tuple(version) return tuple(version)
@ -747,10 +748,8 @@ def get_max_op_version():
salt '*' glusterfs.get_max_op_version salt '*' glusterfs.get_max_op_version
''' '''
if _get_version() < (3, 10,): if _get_version() < (3, 10,):
return False, 'Glusterfs version must be 3.10+. Your version is {0}.'.format(str('.'.join(_get_version()))) return False, 'Glusterfs version must be 3.10+. Your version is {0}.'.format(str('.'.join(str(i) for i in _get_version())))
cmd = 'volume get all cluster.max-op-version' cmd = 'volume get all cluster.max-op-version'
root = _gluster_xml(cmd) root = _gluster_xml(cmd)