mirror of
https://github.com/ansible-collections/community.mysql.git
synced 2025-04-20 17:31:25 -07:00
Rename variable for consistency
This commit is contained in:
parent
f59e94ee04
commit
05215dc1c3
5 changed files with 10 additions and 10 deletions
|
@ -32,7 +32,7 @@
|
||||||
- name: "{{ role_name }} | Setvars | Set Fact using above facts"
|
- name: "{{ role_name }} | Setvars | Set Fact using above facts"
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
connector_name: "{{ connector_name_version.split('=')[0].strip() }}"
|
connector_name: "{{ connector_name_version.split('=')[0].strip() }}"
|
||||||
connector_ver: "{{ connector_name_version.split('=')[2].strip() }}"
|
connector_version: "{{ connector_name_version.split('=')[2].strip() }}"
|
||||||
db_engine: "{{ db_engine_version.split(':')[0].strip() }}"
|
db_engine: "{{ db_engine_version.split(':')[0].strip() }}"
|
||||||
db_version: "{{ db_engine_version.split(':')[1].strip() }}"
|
db_version: "{{ db_engine_version.split(':')[1].strip() }}"
|
||||||
python_version: "{{ python_version_lookup.strip() }}"
|
python_version: "{{ python_version_lookup.strip() }}"
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
vars:
|
vars:
|
||||||
msg: |-
|
msg: |-
|
||||||
connector_name: {{ connector_name }}
|
connector_name: {{ connector_name }}
|
||||||
connector_ver: {{ connector_ver }}
|
connector_version: {{ connector_version }}
|
||||||
db_engine: {{ db_engine }}
|
db_engine: {{ db_engine }}
|
||||||
db_version: {{ db_version }}
|
db_version: {{ db_version }}
|
||||||
python_version: {{ python_version }}
|
python_version: {{ python_version }}
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- primary_info.connector.name == connector_name
|
- primary_info.connector.name == connector_name
|
||||||
- primary_info.connector.version == connector_ver
|
- primary_info.connector.version == connector_version
|
||||||
when:
|
when:
|
||||||
- connector_name == 'pymysql'
|
- connector_name == 'pymysql'
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- primary_info.connector.name == 'MySQLdb'
|
- primary_info.connector.name == 'MySQLdb'
|
||||||
- primary_info.connector.version == connector_ver
|
- primary_info.connector.version == connector_version
|
||||||
when:
|
when:
|
||||||
- connector_name == 'mysqlclient'
|
- connector_name == 'mysqlclient'
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
connector_name != 'pymysql'
|
connector_name != 'pymysql'
|
||||||
or (
|
or (
|
||||||
connector_name == 'pymysql'
|
connector_name == 'pymysql'
|
||||||
and connector_ver is version('0.9.3', '>=')
|
and connector_version is version('0.9.3', '>=')
|
||||||
)
|
)
|
||||||
|
|
||||||
- name: Config overrides | Create include_dir
|
- name: Config overrides | Create include_dir
|
||||||
|
@ -33,7 +33,7 @@
|
||||||
connector_name != 'pymysql'
|
connector_name != 'pymysql'
|
||||||
or (
|
or (
|
||||||
connector_name == 'pymysql'
|
connector_name == 'pymysql'
|
||||||
and connector_ver is version('0.9.3', '>=')
|
and connector_version is version('0.9.3', '>=')
|
||||||
)
|
)
|
||||||
|
|
||||||
- name: Config overrides | Add include_dir
|
- name: Config overrides | Add include_dir
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
connector_name != 'pymysql'
|
connector_name != 'pymysql'
|
||||||
or (
|
or (
|
||||||
connector_name == 'pymysql'
|
connector_name == 'pymysql'
|
||||||
and connector_ver is version('0.9.3', '>=')
|
and connector_version is version('0.9.3', '>=')
|
||||||
)
|
)
|
||||||
|
|
||||||
- name: Config overrides | Create database using fake port to connect to, must fail
|
- name: Config overrides | Create database using fake port to connect to, must fail
|
||||||
|
|
|
@ -372,7 +372,7 @@
|
||||||
or (
|
or (
|
||||||
db_engine == 'mysql'
|
db_engine == 'mysql'
|
||||||
and connector_name == 'mysqlclient'
|
and connector_name == 'mysqlclient'
|
||||||
and connector_ver is version('2.0.1', '>')
|
and connector_version is version('2.0.1', '>')
|
||||||
)
|
)
|
||||||
|
|
||||||
# Issue https://github.com/ansible-collections/community.mysql/issues/268
|
# Issue https://github.com/ansible-collections/community.mysql/issues/268
|
||||||
|
@ -386,7 +386,7 @@
|
||||||
- result is changed
|
- result is changed
|
||||||
when:
|
when:
|
||||||
- connector_name == 'mysqlclient'
|
- connector_name == 'mysqlclient'
|
||||||
- connector_ver is version('2.0.1', '==')
|
- connector_version is version('2.0.1', '==')
|
||||||
- db_engine == 'mysql'
|
- db_engine == 'mysql'
|
||||||
|
|
||||||
- name: Drop db {{ test_db }}
|
- name: Drop db {{ test_db }}
|
||||||
|
|
|
@ -373,7 +373,7 @@
|
||||||
connector_name != 'pymysql'
|
connector_name != 'pymysql'
|
||||||
or (
|
or (
|
||||||
connector_name == 'pymysql'
|
connector_name == 'pymysql'
|
||||||
and connector_ver is version('0.9', '>=')
|
and connector_version is version('0.9', '>=')
|
||||||
)
|
)
|
||||||
block:
|
block:
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue