Merge "Change from PERCONA_SCHEMA to mysql for mariabackup"

ansible/roles/mariadb/defaults/main.yml

@@ -121,7 +121,7 @@ mariadb_wsrep_extra_provider_options: []
 # Backups
 ####################
 mariadb_backup_host: "{{ groups[mariadb_shard_group][0] }}"
-mariadb_backup_database_schema: "PERCONA_SCHEMA"
+mariadb_backup_database_schema: "mysql"
 mariadb_backup_database_user: "{% if mariadb_loadbalancer == 'haproxy' %}backup{% else %}{{ mariadb_shard_backup_user_prefix }}{{ mariadb_shard_id | string }}{% endif %}"
 mariadb_backup_type: "full"
 mariadb_backup_possible: "{{ mariadb_loadbalancer != 'haproxy' or inventory_hostname in mariadb_default_database_shard_hosts }}"

ansible/roles/mariadb/tasks/register.yml

@@ -33,21 +33,6 @@
   when:
     - inventory_hostname == groups[mariadb_shard_group][0]
 
-- name: Creating the Mariabackup database
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: mysql_db
-    module_args:
-      login_host: "{{ api_interface_address }}"
-      login_port: "{{ mariadb_port }}"
-      login_user: "{{ mariadb_shard_database_user }}"
-      login_password: "{{ database_password }}"
-      name: "{{ mariadb_backup_database_schema }}"
-  when:
-    - enable_mariabackup | bool
-    - inventory_hostname == mariadb_backup_host
-
 - name: Creating database backup user and setting permissions
   become: true
   kolla_toolbox: