mirror of
https://github.com/ansible-collections/community.mysql.git
synced 2025-04-08 11:40:33 -07:00
Change suggested
This commit is contained in:
parent
0de26b08bd
commit
14a4a2db38
3 changed files with 5 additions and 35 deletions
1
.github/workflows/ansible-test-plugins.yml
vendored
1
.github/workflows/ansible-test-plugins.yml
vendored
|
@ -111,6 +111,7 @@ jobs:
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
matrix:
|
matrix:
|
||||||
ansible:
|
ansible:
|
||||||
|
- stable-2.9
|
||||||
- stable-2.10
|
- stable-2.10
|
||||||
- devel
|
- devel
|
||||||
|
|
||||||
|
|
|
@ -242,6 +242,7 @@ import warnings
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible_collections.community.mysql.plugins.module_utils.mysql import mysql_connect, mysql_driver, mysql_driver_fail_msg, mysql_common_argument_spec
|
from ansible_collections.community.mysql.plugins.module_utils.mysql import mysql_connect, mysql_driver, mysql_driver_fail_msg, mysql_common_argument_spec
|
||||||
from ansible.module_utils._text import to_native
|
from ansible.module_utils._text import to_native
|
||||||
|
from distutils.version import LooseVersion
|
||||||
|
|
||||||
executed_queries = []
|
executed_queries = []
|
||||||
|
|
||||||
|
@ -256,40 +257,12 @@ def uses_replica_terminology(cursor):
|
||||||
else:
|
else:
|
||||||
version_str = result[0]
|
version_str = result[0]
|
||||||
|
|
||||||
version = version_str.split('.')
|
version = LooseVersion(version_str)
|
||||||
|
|
||||||
ver_major = int(version[0])
|
|
||||||
ver_minor = int(version[1])
|
|
||||||
if '-' in version[2]:
|
|
||||||
ver_patch = int(version[2].split('-')[0])
|
|
||||||
else:
|
|
||||||
ver_patch = int(version[2])
|
|
||||||
|
|
||||||
if 'mariadb' in version_str.lower():
|
if 'mariadb' in version_str.lower():
|
||||||
# Since MariaDB 10.5.1
|
return version >= LooseVersion('10.5.1')
|
||||||
if ver_major > 10:
|
|
||||||
return True
|
|
||||||
|
|
||||||
elif ver_major == 10 and ver_minor > 5:
|
|
||||||
return True
|
|
||||||
|
|
||||||
elif ver_major == 10 and ver_minor == 5 and ver_patch >= 1:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
# Since MySQL 8.0.22
|
return version >= LooseVersion('8.0.22')
|
||||||
if ver_major > 8:
|
|
||||||
return True
|
|
||||||
|
|
||||||
elif ver_major == 8 and ver_minor > 0:
|
|
||||||
return True
|
|
||||||
|
|
||||||
elif ver_major == 8 and ver_minor == 0 and ver_patch >= 22:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def get_master_status(cursor):
|
def get_master_status(cursor):
|
||||||
|
|
|
@ -25,10 +25,6 @@
|
||||||
when:
|
when:
|
||||||
- db.version.major > 8 or (db.version.major == 8 and db.version.minor > 0) or (db.version.major == 8 and db.version.minor == 0 and db.version.release >= 22)
|
- db.version.major > 8 or (db.version.major == 8 and db.version.minor > 0) or (db.version.major == 8 and db.version.minor == 0 and db.version.release >= 22)
|
||||||
|
|
||||||
- name: Debug mysql8022_and_higher
|
|
||||||
debug:
|
|
||||||
msg: "{{ mysql8022_and_higher }} , {{ db.version }}"
|
|
||||||
|
|
||||||
- name: alias mysql command to include default options
|
- name: alias mysql command to include default options
|
||||||
set_fact:
|
set_fact:
|
||||||
mysql_command: "mysql -u{{ mysql_user }} -p{{ mysql_password }} --protocol=tcp"
|
mysql_command: "mysql -u{{ mysql_user }} -p{{ mysql_password }} --protocol=tcp"
|
||||||
|
|
Loading…
Add table
Reference in a new issue