cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix monit version check

Browse source 
it was erroneously checking > 3.18 instead of > 5.18

Fixes #30614
This commit is contained in:
Daniel Roberts 2017-10-02 15:06:04 -04:00 committed by Toshio Kuratomi
parent b26ae1809c
commit 34878926ca
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/monitoring/monit.py
View file

@ -79,11 +79,11 @@ def main():
# Use only major and minor even if there are more these should be enough # Use only major and minor even if there are more these should be enough
return int(version[0]), int(version[1]) return int(version[0]), int(version[1])
def is_version_higher_than_18(): def is_version_higher_than_5_18():
return MONIT_MAJOR_VERSION > 3 or MONIT_MAJOR_VERSION == 3 and MONIT_MINOR_VERSION > 18 return (MONIT_MAJOR_VERSION, MONIT_MINOR_VERSION) > (5, 18)
def parse(parts): def parse(parts):
if is_version_higher_than_18(): if is_version_higher_than_5_18():
return parse_current(parts) return parse_current(parts)
else: else:
return parse_older_versions(parts) return parse_older_versions(parts)
@ -138,7 +138,7 @@ def main():
MONIT_MAJOR_VERSION, MONIT_MINOR_VERSION = monit_version() MONIT_MAJOR_VERSION, MONIT_MINOR_VERSION = monit_version()
SUMMARY_COMMAND = ('summary', 'summary -B')[is_version_higher_than_18()] SUMMARY_COMMAND = ('summary', 'summary -B')[is_version_higher_than_5_18()]
if state == 'reloaded': if state == 'reloaded':
if module.check_mode: if module.check_mode: