From f14b6cecec852327dff46e8458eac877d61ab1b4 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 9 Dec 2025 15:21:36 +0100 Subject: Use mariadb command instead of mysql for upgrade This fixes upgrades from 2025.2 to master, since 2025.2 images do not include the mysql binary anymore [1]. SLURP upgrades should still work, since 2025.1 images include both commands: $ ls -l /usr/bin/mariadb /usr/bin/mysql -rwxr-xr-x. 1 root root 5390512 Nov 3 13:25 /usr/bin/mariadb lrwxrwxrwx. 1 root root 7 Nov 3 13:25 /usr/bin/mysql -> mariadb [1] https://review.opendev.org/c/openstack/kolla/+/926981 Change-Id: Iccd0270ac3c0adbea56fbe3c8b80e1bb644c20c5 Signed-off-by: Pierre Riteau --- ansible/roles/mariadb/tasks/upgrade.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/mariadb/tasks/upgrade.yml b/ansible/roles/mariadb/tasks/upgrade.yml index 3f328a371..c1199f941 100644 --- a/ansible/roles/mariadb/tasks/upgrade.yml +++ b/ansible/roles/mariadb/tasks/upgrade.yml @@ -5,7 +5,7 @@ no_log: true shell: > {{ kolla_container_engine }} exec {{ mariadb_service.container_name }} - mysql -uroot -p{{ database_password }} + mariadb -uroot -p{{ database_password }} -e "SET GLOBAL wsrep_sst_method='rsync';" - import_tasks: deploy.yml @@ -18,7 +18,7 @@ no_log: true shell: > {{ kolla_container_engine }} exec {{ mariadb_service.container_name }} - mysql -uroot -p{{ database_password }} + mariadb -uroot -p{{ database_password }} -e "SET GLOBAL wsrep_sst_method='mariabackup';" - import_tasks: deploy.yml -- cgit v1.2.3