ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-06 10:40:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mysql: revert changes made in PR 116 (#153) (#156)

Browse source 
* mysql: revert changes made in PR 116

* Add changelog fragment

* Fix CI

* Fix CI

* Fix CI

* Update CI

* Fix CI

(cherry picked from commit 738343d64c)
This commit is contained in:
Andrew Klychkov 2021-04-23 15:08:49 +03:00 • committed by GitHub
parent 59cbe5ffe3
commit fe8f3662eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ansible-test-plugins.yml vendored
View file

@ -61,7 +61,7 @@ jobs:
- stable-2.9 - stable-2.9
- stable-2.10 - stable-2.10
- stable-2.11 - stable-2.11
- devel #- devel
python: python:
- 3.6 - 3.6
connector: connector:

2
changelogs/fragments/153-mysql_revert_connector_changes.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- mysql - revert changes of connector arguments made in pull request 116 causing the invalid keyword argument error (https://github.com/ansible-collections/community.mysql/pull/116).

4
plugins/module_utils/mysql.py
View file

@ -79,7 +79,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
if login_user is not None: if login_user is not None:
config['user'] = login_user config['user'] = login_user
if login_password is not None: if login_password is not None:
config['password'] = login_password config['passwd'] = login_password
if ssl_cert is not None: if ssl_cert is not None:
config['ssl']['cert'] = ssl_cert config['ssl']['cert'] = ssl_cert
if ssl_key is not None: if ssl_key is not None:
@ -87,7 +87,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
if ssl_ca is not None: if ssl_ca is not None:
config['ssl']['ca'] = ssl_ca config['ssl']['ca'] = ssl_ca
if db is not None: if db is not None:
config['database'] = db config['db'] = db
if connect_timeout is not None: if connect_timeout is not None:
config['connect_timeout'] = connect_timeout config['connect_timeout'] = connect_timeout
if check_hostname is not None: if check_hostname is not None: