diff --git a/lib/ansible/utils/module_docs_fragments/mysql.py b/lib/ansible/utils/module_docs_fragments/mysql.py index 5dd1e04f93b..e57acab9b40 100644 --- a/lib/ansible/utils/module_docs_fragments/mysql.py +++ b/lib/ansible/utils/module_docs_fragments/mysql.py @@ -47,6 +47,12 @@ options: - The path to a Unix domain socket for local connections required: false default: null + connect_timeout: + description: + - The connection timeout when connecting to the MySQL server. + required: false + default: 30 + version_added: "2.1" config_file: description: - Specify a config file from which user and password are to be read diff --git a/test/integration/roles/test_mysql_variables/tasks/main.yml b/test/integration/roles/test_mysql_variables/tasks/main.yml index 192472bf46f..26fc03c8679 100644 --- a/test/integration/roles/test_mysql_variables/tasks/main.yml +++ b/test/integration/roles/test_mysql_variables/tasks/main.yml @@ -194,11 +194,8 @@ #============================================================ # 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 - 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 ignore_errors: true