diff options
| author | Pierre Riteau <pierre@stackhpc.com> | 2025-12-09 15:21:36 +0100 |
|---|---|---|
| committer | Pierre Riteau <pierre@stackhpc.com> | 2025-12-09 15:21:36 +0100 |
| commit | f14b6cecec852327dff46e8458eac877d61ab1b4 (patch) | |
| tree | 7f4f107b3b937e700e2aeec9113d2d6630f1d55e | |
| parent | 2760845ea60f9dab4fe66bd758ee541f2bf3877d (diff) | |
| download | kolla-ansible-f14b6cecec852327dff46e8458eac877d61ab1b4.tar.gz kolla-ansible-f14b6cecec852327dff46e8458eac877d61ab1b4.zip | |
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 <pierre@stackhpc.com>
| -rw-r--r-- | ansible/roles/mariadb/tasks/upgrade.yml | 4 |
1 files 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 |