Merge "Fix Mariadb 10.3 -> 10.4 upgrade path"

handlers/main.yml

@@ -50,7 +50,7 @@
 
 - name: Stop mysql
   service:
-    name: mysql
+    name: "{{ galera_mariadb_service_name }}"
     state: stopped
   changed_when: true
   listen: Bootstrap cluster

tasks/galera_server_post_install.yml

@@ -100,7 +100,7 @@
     dest: "{{ item.dest }}"
     owner: "root"
     group: "root"
-    mode: "0644"
+    mode: "{{ item.mode | default('0644') }}"
     config_overrides: "{{ item.config_overrides }}"
     config_type: "{{ item.config_type }}"
     ignore_none_type: False
@@ -119,6 +119,11 @@
       config_overrides: "{{ galera_debian_cnf_overrides }}"
       config_type: "ini"
       condition: "{{ (ansible_os_family | lower == 'debian') }}"
+    - src: "client.my.cnf.j2"
+      dest: "/root/.my.cnf"
+      config_overrides: "{{ galera_client_my_cnf_overrides }}"
+      config_type: "ini"
+      mode: "0600"
   notify:
     - Manage LB
     - Restart all mysql

tasks/galera_server_upgrade_pre.yml

@@ -19,7 +19,7 @@
 # we only try to stop the service is it exists.
 - name: Check whether a mysql service exists yet
   shell: >-
-    systemctl list-unit-files --state=enabled --type=service | grep "^mysql.service .* enabled$"
+    systemctl list-unit-files --state=enabled --type=service | grep "^{{ galera_mariadb_service_name }}.service .* enabled$"
   args:
     executable: /bin/bash
     warn: no
@@ -29,7 +29,7 @@
 
 - name: Stop MariaDB
   systemd:
-    name: mysql
+    name: "{{ galera_mariadb_service_name }}"
     state: stopped
   register: galera_restart_fall_back
   until: galera_restart_fall_back is success

tasks/main.yml

@@ -27,6 +27,7 @@
 - include_tasks: galera_client_main.yml
   when:
     - galera_install_client | bool
+    - inventory_hostname not in galera_cluster_members
 
 - include_tasks: galera_server_main.yml
   when:

vars/debian.yml

@@ -53,7 +53,7 @@ _galera_mariadb_server_package: "mariadb-server-{{ galera_major_version }}"
 # mariadb-galera-server and galera.
 galera_server_mariadb_distro_packages:
   - libmariadb-dev
-  - mariadb-client
+  - mariadb-client-{{ galera_major_version }}
   - mariadb-backup
   - "{{ galera_mariadb_server_package }}"
   - rsync
@@ -61,7 +61,7 @@ galera_server_mariadb_distro_packages:
 
 # The packages to uninstall during an upgrade from a previous version
 galera_server_upgrade_packages_remove:
-  - mariadb-server
+  - mariadb-server-*
   - mysql-common
 
 galera_debconf_items:

vars/redhat.yml

@@ -57,6 +57,7 @@ galera_mariadb_distro_packages_remove:
 
 # The packages to uninstall during an upgrade from a previous version
 galera_server_upgrade_packages_remove:
+  - galera-*
   - MariaDB-Galera-server
   - MariaDB-server