Rename variable for consistency

This commit is contained in:
Laurent Indermuehle 2023-01-20 14:02:28 +01:00
parent f59e94ee04
commit 05215dc1c3
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
5 changed files with 10 additions and 10 deletions

View file

@ -32,7 +32,7 @@
- name: "{{ role_name }} | Setvars | Set Fact using above facts"
ansible.builtin.set_fact:
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_version: "{{ db_engine_version.split(':')[1].strip() }}"
python_version: "{{ python_version_lookup.strip() }}"
@ -55,7 +55,7 @@
vars:
msg: |-
connector_name: {{ connector_name }}
connector_ver: {{ connector_ver }}
connector_version: {{ connector_version }}
db_engine: {{ db_engine }}
db_version: {{ db_version }}
python_version: {{ python_version }}

View file

@ -27,7 +27,7 @@
assert:
that:
- primary_info.connector.name == connector_name
- primary_info.connector.version == connector_ver
- primary_info.connector.version == connector_version
when:
- connector_name == 'pymysql'
@ -35,7 +35,7 @@
assert:
that:
- primary_info.connector.name == 'MySQLdb'
- primary_info.connector.version == connector_ver
- primary_info.connector.version == connector_version
when:
- connector_name == 'mysqlclient'

View file

@ -20,7 +20,7 @@
connector_name != 'pymysql'
or (
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
@ -33,7 +33,7 @@
connector_name != 'pymysql'
or (
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
@ -46,7 +46,7 @@
connector_name != 'pymysql'
or (
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

View file

@ -372,7 +372,7 @@
or (
db_engine == 'mysql'
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
@ -386,7 +386,7 @@
- result is changed
when:
- connector_name == 'mysqlclient'
- connector_ver is version('2.0.1', '==')
- connector_version is version('2.0.1', '==')
- db_engine == 'mysql'
- name: Drop db {{ test_db }}

View file

@ -373,7 +373,7 @@
connector_name != 'pymysql'
or (
connector_name == 'pymysql'
and connector_ver is version('0.9', '>=')
and connector_version is version('0.9', '>=')
)
block: