internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14908 from mattclay/mysql-connect-timeout

Browse Source 
Document mysql connect_timeout and update tests.
This commit is contained in:
Toshio Kuratomi
2016-03-17 07:18:01 -07:00
parent 0c6693aa4c 9a922fcf0d
commit e80cd8bcaf
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/utils/module_docs_fragments/mysql.py
View File

@@ -47,6 +47,12 @@ options:
- The path to a Unix domain socket for local connections - The path to a Unix domain socket for local connections
required: false required: false
default: null default: null
connect_timeout:
description:
- The connection timeout when connecting to the MySQL server.
required: false
default: 30
version_added: "2.1"
config_file: config_file:
description: description:
- Specify a config file from which user and password are to be read - Specify a config file from which user and password are to be read

5
test/integration/roles/test_mysql_variables/tasks/main.yml
View File

@@ -194,11 +194,8 @@
#============================================================ #============================================================
# Verify mysql_variable fails with an incorrect login_host parameter # Verify mysql_variable fails with an incorrect login_host parameter
# #
- name: lower mysql connect timeout
ini_file: dest="{{ansible_env.HOME}}/.my.cnf" section=client option=connect_timeout value=5
- name: query mysql_variable using incorrect login_host - name: query mysql_variable using incorrect login_host
mysql_variables: variable=wait_timeout login_host=12.0.0.9 mysql_variables: variable=wait_timeout login_host=12.0.0.9 connect_timeout=5
register: result register: result
ignore_errors: true ignore_errors: true