Ignore check_hostname when using MySQLdb

plugins/doc_fragments/mysql.py

@@ -66,7 +66,8 @@ options:
     description:
       - Whether to validate the server host name when an SSL connection is required.
       - Setting this to False disables hostname verification. Use with caution.
-      - Requires pymysql >= 0.7.11. MySQLdb does not support this option.
+      - Requires pymysql >= 0.7.11.
+      - This optoin has no effect on MySQLdb.
     type: bool
 requirements:
    - PyMySQL (Python 2.7 and Python 3.X), or

plugins/module_utils/mysql.py

@@ -87,8 +87,6 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='',
                 config['ssl']['check_hostname'] = check_hostname
             else:
                 module.fail_json(msg='To use check_hostname, pymysql >= 0.7.11 is required on the target host')
-        else:
-            module.fail_json(msg='Connector %s does not support the check_hostname option' % mysql_driver.__name__)
 
     if _mysql_cursor_param == 'cursor':
         # In case of PyMySQL driver:

tests/integration/targets/test_mysql_db/tasks/issue-28.yml

@@ -51,6 +51,11 @@
           - result is failed
       when: pymysql_version.stdout != ""
 
+    - assert:
+        that:
+          - result is succeeded
+      when: pymysql_version.stdout == ""
+
     - name: attempt connection with newly created user ignoring hostname
       mysql_db:
         name: '{{ db_name }}'
@@ -66,7 +71,7 @@
 
     - assert:
         that:
-          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg or 'MySQLdb does not support' in result.msg
+          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg
 
     - name: Drop mysql user
       mysql_user:

tests/integration/targets/test_mysql_info/tasks/issue-28.yml

@@ -49,6 +49,11 @@
           - result is failed
       when: pymysql_version.stdout != ""
 
+    - assert:
+        that:
+          - result is succeeded
+      when: pymysql_version.stdout == ""
+
     - name: attempt connection with newly created user ignoring hostname
       mysql_info:
         filter: version
@@ -63,7 +68,7 @@
 
     - assert:
         that:
-          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg or 'MySQLdb does not support' in result.msg
+          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg
 
     - name: Drop mysql user
       mysql_user:

tests/integration/targets/test_mysql_query/tasks/issue-28.yml

@@ -49,6 +49,11 @@
           - result is failed
       when: pymysql_version.stdout != ""
 
+    - assert:
+        that:
+          - result is succeeded
+      when: pymysql_version.stdout == ""
+
     - name: attempt connection with newly created user ignoring hostname
       mysql_query:
         query: 'SHOW DATABASES'
@@ -63,7 +68,7 @@
 
     - assert:
         that:
-          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg or 'MySQLdb does not support' in result.msg
+          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg
 
     - name: Drop mysql user
       mysql_user:

tests/integration/targets/test_mysql_replication/tasks/issue-28.yml

@@ -50,6 +50,11 @@
           - result is failed
       when: pymysql_version.stdout != ""
 
+    - assert:
+        that:
+          - result is succeeded
+      when: pymysql_version.stdout == ""
+
     - name: attempt connection with newly created user ignoring hostname
       mysql_replication:
         mode: getmaster
@@ -64,7 +69,7 @@
 
     - assert:
         that:
-          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg or 'MySQLdb does not support' in result.msg
+          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg
 
     - name: Drop mysql user
       mysql_user:

tests/integration/targets/test_mysql_user/tasks/issue-28.yml

@@ -52,6 +52,11 @@
           - result is failed
       when: pymysql_version.stdout != ""
 
+    - assert:
+        that:
+          - result is succeeded
+      when: pymysql_version.stdout == ""
+
     - name: attempt connection with newly created user ignoring hostname
       mysql_user:
         name: "{{ user_name_2 }}"
@@ -68,7 +73,7 @@
 
     - assert:
         that:
-          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg or 'MySQLdb does not support' in result.msg
+          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg
 
     - name: Drop mysql user
       mysql_user:

tests/integration/targets/test_mysql_variables/tasks/issue-28.yml

@@ -50,6 +50,11 @@
           - result is failed
       when: pymysql_version.stdout != ""
 
+    - assert:
+        that:
+          - result is succeeded
+      when: pymysql_version.stdout == ""
+
     - name: attempt connection with newly created user ignoring hostname
       mysql_variables:
         variable: '{{ set_name }}'
@@ -64,7 +69,7 @@
 
     - assert:
         that:
-          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg or 'MySQLdb does not support' in result.msg
+          - result is succeeded or 'pymysql >= 0.7.11 is required' in result.msg
 
     - name: Drop mysql user
       mysql_user: