Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions plugins/module_utils/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import re


def is_invalid_gluster_version(module, required_version):
cmd = module.get_bin_path("gluster", True) + " --version"
result = module.run_command(cmd)
ver_line = result[1].split("\n")[0]
version = ver_line.split(" ")[1]
return parse_version(version) < parse_version(required_version)


# Copied from the old distutils.version.LooseVersion.
# https://github.com/pypa/distutils/blob/main/distutils/version.py

version_component_re = re.compile(r"(\d+ | [a-z]+ | \.)", re.VERBOSE)


def parse_version(vstring):
components = [x for x in version_component_re.split(vstring) if x and x != "."]
for i, obj in enumerate(components):
try:
components[i] = int(obj)
except ValueError:
pass
return components

14 changes: 3 additions & 11 deletions plugins/modules/gluster_heal_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@

from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_native
from distutils.version import LooseVersion
from ansible_collections.gluster.gluster.plugins.module_utils.version import (
is_invalid_gluster_version,
)

glusterbin = ''

Expand Down Expand Up @@ -148,16 +150,6 @@ def get_rebalance_status(name):
return rebalance_status


def is_invalid_gluster_version(module, required_version):
cmd = module.get_bin_path('gluster', True) + ' --version'
result = module.run_command(cmd)
ver_line = result[1].split('\n')[0]
version = ver_line.split(' ')[1]
# If the installed version is less than 3.2, it is an invalid version
# return True
return LooseVersion(version) < LooseVersion(required_version)


def main():
global module
global glusterbin
Expand Down
14 changes: 3 additions & 11 deletions plugins/modules/gluster_peer.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@
'''

from ansible.module_utils.basic import AnsibleModule
from distutils.version import LooseVersion
from ansible_collections.gluster.gluster.plugins.module_utils.version import (
is_invalid_gluster_version,
)


class Peer(object):
Expand Down Expand Up @@ -163,15 +165,5 @@ def main():
pops.gluster_peer_ops()


def is_invalid_gluster_version(module, required_version):
cmd = module.get_bin_path('gluster', True) + ' --version'
result = module.run_command(cmd)
ver_line = result[1].split('\n')[0]
version = ver_line.split(' ')[1]
# If the installed version is less than 3.2, it is an invalid version
# return True
return LooseVersion(version) < LooseVersion(required_version)


if __name__ == "__main__":
main()