Use mysql_host var name instead of gateway_addr in tests

tests/integration/targets/test_mysql_db/defaults/main.yml

@@ -2,6 +2,7 @@
 # defaults file for test_mysql_db
 mysql_user: root
 mysql_password: msandbox
+mysql_host: '{{ gateway_addr }}'
 mysql_primary_port: 3307
 
 # Database names

tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml

@@ -53,7 +53,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_to_create }}'
     state: present
@@ -73,7 +73,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_to_create }}'
     state: present
@@ -97,7 +97,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_to_create }}'
     state: absent
@@ -116,7 +116,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_to_create }}'
     state: absent

tests/integration/targets/test_mysql_db/tasks/encoding_dump_import.yml

@@ -8,7 +8,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_latin1_name }}'
     state: absent
@@ -17,7 +17,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_latin1_name }}'
     state: present
@@ -46,7 +46,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: "{{ db_latin1_name }}"
     encoding: latin1
@@ -74,7 +74,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_latin1_name }}'
     state: absent
@@ -83,7 +83,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     state: import
     encoding: latin1
@@ -109,7 +109,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_latin1_name }}'
     state: absent

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

@@ -9,7 +9,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   when: tls_enabled
   block:
@@ -43,7 +43,7 @@
         state: absent
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
       register: result
@@ -65,7 +65,7 @@
         state: absent
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
         check_hostname: no

tests/integration/targets/test_mysql_db/tasks/issue_256_mysqldump_errors.yml

@@ -7,7 +7,7 @@
     community.mysql.mysql_db: &mysql_defaults
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
     community.mysql.mysql_query: *mysql_defaults
 

tests/integration/targets/test_mysql_db/tasks/multi_db_create_delete.yml

@@ -18,7 +18,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -43,7 +43,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -75,7 +75,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -107,7 +107,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -139,7 +139,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -170,7 +170,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db2_name }}'
@@ -199,7 +199,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -231,7 +231,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -271,7 +271,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -308,7 +308,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - "{{ db1_name }}"
@@ -348,7 +348,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - "{{ db4_name }}"
@@ -395,7 +395,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'
@@ -458,7 +458,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: all
     state: dump
@@ -500,7 +500,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db2_name }}'
@@ -530,7 +530,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db2_name }}'
@@ -560,7 +560,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db2_name }}'
@@ -590,7 +590,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db2_name }}'
@@ -619,7 +619,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db1_name }}'

tests/integration/targets/test_mysql_db/tasks/state_dump_import.yml

@@ -34,7 +34,7 @@
   mysql_user:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_user }}'
     host: '%'
@@ -46,7 +46,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: present
@@ -56,7 +56,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name2 }}'
     state: present
@@ -99,7 +99,7 @@
   mysql_db:
     login_user: '{{ db_user }}'
     login_password: '{{ db_user_unsafe_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     unsafe_login_password: yes
     name: '{{ db_name }}'
@@ -141,7 +141,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: "{{ db_name }},{{ db_name2 }}"
     state: dump
@@ -174,7 +174,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db_name }}'
@@ -213,7 +213,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name:
       - '{{ db_name }}'
@@ -240,7 +240,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: absent
@@ -249,7 +249,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name2 }}'
     state: absent
@@ -258,7 +258,7 @@
   mysql_db:
     login_user: '{{ db_user }}'
     login_password: '{{ db_user_unsafe_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     unsafe_login_password: yes
     name: '{{ db_name }}'
@@ -280,7 +280,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name2 }}'
     state: import
@@ -297,7 +297,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name2 }}'
     state: absent
@@ -315,7 +315,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name2 }}'
     state: import
@@ -341,7 +341,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name2 }}'
     state: import
@@ -373,7 +373,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: dump
@@ -406,7 +406,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: import
@@ -439,7 +439,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: import
@@ -456,7 +456,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: import
@@ -486,7 +486,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: import
@@ -502,7 +502,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: import
@@ -521,7 +521,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ item }}'
     state: absent

tests/integration/targets/test_mysql_db/tasks/state_present_absent.yml

@@ -31,7 +31,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: present
@@ -58,7 +58,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_name }}'
     state: absent
@@ -85,7 +85,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: datanotvalid
     state: present
@@ -105,7 +105,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: 'en{{ db_name }}'
     state: present
@@ -131,7 +131,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: 'en{{ db_name }}'
     state: absent
@@ -141,7 +141,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: 'en{{ db_name }}'
     state: present
@@ -167,7 +167,7 @@
   mysql_db:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: 'en{{ db_name }}'
     state: absent
@@ -177,7 +177,7 @@
   mysql_user:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: user1
     host: '%'
@@ -189,7 +189,7 @@
   mysql_db:
     login_user: user1
     login_password: 'Hfd6fds^dfA8Ga'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_user1 }}'
     state: present
@@ -214,7 +214,7 @@
   mysql_user:
     login_user: '{{ mysql_user }}'
     login_password: '{{ mysql_password }}'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: user2
     password: 'kjsfd&F7safjad'
@@ -225,7 +225,7 @@
   mysql_db:
     login_user: user2
     login_password: 'kjsfd&F7safjad'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_user2 }}'
     state: present
@@ -252,7 +252,7 @@
   mysql_db:
     login_user: user2
     login_password: 'kjsfd&F7safjad'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_user1 }}'
     state: absent
@@ -279,7 +279,7 @@
   mysql_db:
     login_user: user1
     login_password: 'Hfd6fds^dfA8Ga'
-    login_host: '{{ gateway_addr }}'
+    login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
     name: '{{ db_user1 }}'
     state: absent

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

@@ -10,7 +10,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   when: tls_enabled
   block:
@@ -42,7 +42,7 @@
         filter: version
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
       register: result
@@ -63,7 +63,7 @@
         filter: version
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
         check_hostname: no

tests/integration/targets/test_mysql_query/defaults/main.yml

@@ -1,5 +1,6 @@
 mysql_user: root
 mysql_password: msandbox
+mysql_host: '{{ gateway_addr }}'
 mysql_primary_port: 3307
 
 db_name: data

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

@@ -10,7 +10,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   when: tls_enabled
   block:
@@ -42,7 +42,7 @@
         query: 'SHOW DATABASES'
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
       register: result
@@ -63,7 +63,7 @@
         query: 'SHOW DATABASES'
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
         check_hostname: no

tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml

@@ -5,7 +5,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
 
   block:

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

@@ -4,7 +4,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   block:
 
@@ -46,7 +46,7 @@
         mode: getprimary
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_replica1_port }}'
       register: result
       ignore_errors: yes
@@ -68,7 +68,7 @@
         mode: getprimary
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_replica1_port }}'
       register: result
       ignore_errors: yes
@@ -127,7 +127,7 @@
         mode: getprimary
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_replica1_port }}'
       register: result
       ignore_errors: yes

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

@@ -10,7 +10,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   when: tls_enabled
   block:
@@ -43,7 +43,7 @@
         mode: getprimary
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
       register: result
@@ -64,7 +64,7 @@
         mode: getprimary
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
         check_hostname: no

tests/integration/targets/test_mysql_replication/tasks/mysql_replication_channel.yml

@@ -6,7 +6,7 @@
     mysql_params: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
 
   block:
     # Get primary log file and log pos:

tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml

@@ -5,7 +5,7 @@
     mysql_params: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
 
   block:
 

tests/integration/targets/test_mysql_replication/tasks/mysql_replication_resetprimary_mode.yml

@@ -5,7 +5,7 @@
     mysql_params: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
 
   block:
 

tests/integration/targets/test_mysql_role/defaults/main.yml

@@ -1,5 +1,7 @@
+---
 mysql_user: root
 mysql_password: msandbox
+mysql_host: '{{ gateway_addr }}'
 mysql_primary_port: 3307
 
 test_db: test_db

tests/integration/targets/test_mysql_role/tasks/mysql_role_initial.yml

@@ -5,7 +5,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
 
     task_parameters: &task_params
@@ -135,7 +135,7 @@
     mysql_query:
       login_user: '{{ user0 }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
       query: 'SELECT COALESCE(current_role(), "NONE") as "current_role()"'
 
@@ -200,7 +200,7 @@
     mysql_query:
       login_user: '{{ user0 }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
       query: 'SELECT current_role()'
     when: db_engine == 'mysql'
@@ -216,7 +216,7 @@
     mysql_query:
       login_user: '{{ user0 }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
       query:
         - 'SET ROLE {{ role0 }}'

tests/integration/targets/test_mysql_role/tasks/test_priv_subtract.yml

@@ -3,7 +3,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
 
   block:

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

@@ -46,7 +46,7 @@
         host: '{{ gateway_addr }}'
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
       register: result
@@ -71,7 +71,7 @@
         host: '{{ gateway_addr }}'
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
         check_hostname: false

tests/integration/targets/test_mysql_variables/defaults/main.yml

@@ -2,6 +2,7 @@
 # defaults file for test_mysql_variables
 mysql_user: root
 mysql_password: msandbox
+mysql_host: '{{ gateway_addr }}'
 mysql_primary_port: 3307
 
 user_name_1: 'db_user1'

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

@@ -9,7 +9,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   when: tls_enabled
   block:
@@ -42,7 +42,7 @@
         variable: '{{ set_name }}'
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
       register: result
@@ -63,7 +63,7 @@
         variable: '{{ set_name }}'
         login_user: '{{ user_name_1 }}'
         login_password: '{{ user_password_1 }}'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         ca_cert: /tmp/cert.pem
         check_hostname: no

tests/integration/targets/test_mysql_variables/tasks/mysql_variables.yml

@@ -23,7 +23,7 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: '{{ gateway_addr }}'
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
 
   block:
@@ -242,7 +242,7 @@
       mysql_variables:
         login_user: '{{ mysql_user }}'
         login_password: 'wrongpassword'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         variable: '{{ set_name }}'
       register: result
@@ -254,7 +254,7 @@
       mysql_variables:
         login_user: '{{ mysql_user }}'
         login_password: 'wrongpassword'
-        login_host: '{{ gateway_addr }}'
+        login_host: '{{ mysql_host }}'
         login_port: '{{ mysql_primary_port }}'
         variable: '{{ set_name }}'
         value: '{{ set_value }}'