Refactor setup_mysql into setup_controller

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

@@ -1,5 +1,4 @@
 ---
 home_dir: "{{ playbook_dir }}/root"
 db_engine_version: mysql:8.0.22
-mysql_base_port: 3306
 python_packages: [pymysql == 0.9.3]

tests/integration/targets/setup_controller/tasks/install.yml

@@ -5,10 +5,6 @@
     name:
       - mysql-client
       - iproute2
-      # - python3-dev
-      # - python3-cryptography
-      # - default-libmysqlclient-dev
-      # - build-essential
     state: present
     update_cache: true
   environment:
@@ -19,12 +15,12 @@
     name: "{{ python_packages }}"
   register: connector
 
-- name: Ensure fake root folder
+- name: "{{ role_name }} | install | Ensure fake root folder"
   ansible.builtin.file:
     path: "{{ playbook_dir }}/root"
     state: directory
 
-- name: Ensure fake root default file exists
+- name: "{{ role_name }} | install | Ensure fake root default file exists"
   ansible.builtin.file:
     path: "{{ playbook_dir }}/root/.my.cnf"
     state: touch

tests/integration/targets/setup_controller/tasks/main.yml

@@ -6,12 +6,8 @@
 
 - name: Prepare the controller python and MySQL connector
   ansible.builtin.import_tasks:
-    file: prepare_controller.yml
-  tags:
-    - setup_mysql
+    file: install.yml
 
 - name: Set variables
   ansible.builtin.import_tasks:
     file: setvars.yml
-  tags:
-    - setup_mysql

tests/integration/targets/setup_mysql/handlers/main.yml

@@ -1,8 +0,0 @@
----
-- name: "{{ role_name }} | handler | create dbdeployer installed file"
-  template:
-    src: installed_file.j2
-    dest: "{{ dbdeployer_installed_file }}"
-  listen: create zookeeper installed file
-  tags:
-    - setup_mysql

tests/integration/targets/setup_mysql/tasks/verify.yml

@@ -1,27 +0,0 @@
----
-- name: "{{ role_name }} | verify | confirm primary is running and get the port"
-  shell: "{{ dbdeployer_sandbox_home_dir }}/multi_msb_{{ install_version|replace('.','_') }}/n1 -BNe'select @@port'"
-  register: primary_port
-
-- name: "{{ role_name }} | verify | confirm replica1 is running and get the port"
-  shell: "{{ dbdeployer_sandbox_home_dir }}/multi_msb_{{ install_version|replace('.','_') }}/n2 -BNe'select @@port'"
-  register: replica1_port
-
-- name: "{{ role_name }} | verify | confirm replica2 is running and get the port"
-  shell: "{{ dbdeployer_sandbox_home_dir }}/multi_msb_{{ install_version|replace('.','_') }}/n3 -BNe'select @@port'"
-  register: replica2_port
-
-- name: "{{ role_name }} | verify | confirm primary is running on expected port"
-  assert:
-    that:
-      - primary_port.stdout|int == 3307
-
-- name: "{{ role_name }} | verify | confirm replica1 is running on expected port"
-  assert:
-    that:
-      - replica1_port.stdout|int == 3308
-
-- name: "{{ role_name }} | verify | confirm replica2 is running on expected port"
-  assert:
-    that:
-      - replica2_port.stdout|int == 3309

tests/integration/targets/setup_mysql/templates/installed_file.j2

@@ -1 +0,0 @@
-{{ dbdeployer_version }}

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

@@ -1,2 +1,2 @@
 dependencies:
-  - setup_mysql
+  - setup_controller

tests/integration/targets/test_mysql_info/meta/main.yml

@@ -1,3 +1,4 @@
+---
 dependencies:
-  - setup_mysql
+  - setup_controller
   - setup_remote_tmp_dir

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

@@ -1,2 +1,3 @@
+---
 dependencies:
-- setup_mysql
+  - setup_controller

tests/integration/targets/test_mysql_replication/meta/main.yml

@@ -1,3 +1,3 @@
 ---
 dependencies:
-- setup_mysql
+  - setup_controller

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

@@ -1,2 +1,3 @@
+---
 dependencies:
-- setup_mysql
+  - setup_controller

tests/integration/targets/test_mysql_user/meta/main.yml

@@ -1,3 +1,4 @@
+---
 dependencies:
-  - setup_mysql
+  - setup_controller
   - setup_remote_tmp_dir

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

@@ -1,2 +1,3 @@
+---
 dependencies:
-  - setup_mysql
+  - setup_controller