Merge "mariadb: switch to use mariadb flavored commands"

openstack · Dec 3, 2024 · 97e69bc · 97e69bc
2 parents c7b4cfa + 065bc80
commit 97e69bc
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/ansible/roles/mariadb/handlers/main.yml b/ansible/roles/mariadb/handlers/main.yml
@@ -37,7 +37,7 @@
   become: true
   command: >-
     {{ kolla_container_engine }} exec {{ mariadb_service.container_name }}
-    mysql -uroot -p{{ database_password }}
+    mariadb -uroot -p{{ database_password }}
     --silent --skip-column-names
     -e 'SHOW STATUS LIKE "wsrep_local_state_comment"'
   changed_when: false

diff --git a/ansible/roles/mariadb/tasks/check.yml b/ansible/roles/mariadb/tasks/check.yml
@@ -6,7 +6,7 @@
   become: true
   command: >
     {{ kolla_container_engine }} exec {{ mariadb_service.container_name }}
-    mysql -h {{ database_address }} -P {{ database_port }}
+    mariadb -h {{ database_address }} -P {{ database_port }}
     -u {{ mariadb_shard_database_user }} -p{{ database_password }} -e 'show databases;'
   register: result
   until: result is success

diff --git a/ansible/roles/mariadb/tasks/lookup_cluster.yml b/ansible/roles/mariadb/tasks/lookup_cluster.yml
@@ -46,7 +46,7 @@
           become: true
           command: >-
             {{ kolla_container_engine }} exec {{ mariadb_service.container_name }}
-            mysql -uroot -p{{ database_password }}
+            mariadb -uroot -p{{ database_password }}
             --silent --skip-column-names
             -e 'SHOW STATUS LIKE "wsrep_local_state_comment"'
           changed_when: false

diff --git a/ansible/roles/mariadb/tasks/recover_cluster.yml b/ansible/roles/mariadb/tasks/recover_cluster.yml
@@ -146,7 +146,7 @@
 
 - name: Set first MariaDB container as primary
   become: true
-  shell: "{{ kolla_container_engine }} exec {{ mariadb_service.container_name }} mysql -uroot -p{{ database_password }} -e \"SET GLOBAL wsrep_provider_options='pc.bootstrap=yes';\""
+  shell: "{{ kolla_container_engine }} exec {{ mariadb_service.container_name }} mariadb -uroot -p{{ database_password }} -e \"SET GLOBAL wsrep_provider_options='pc.bootstrap=yes';\""
   no_log: True
   when:
     - bootstrap_host is defined
@@ -156,7 +156,7 @@
   become: true
   command: >-
     {{ kolla_container_engine }} exec {{ mariadb_service.container_name }}
-    mysql -uroot -p{{ database_password }}
+    mariadb -uroot -p{{ database_password }}
     --silent --skip-column-names
     -e 'SHOW STATUS LIKE "wsrep_evs_state"'
   changed_when: false

diff --git a/ansible/roles/mariadb/tasks/restart_services.yml b/ansible/roles/mariadb/tasks/restart_services.yml
@@ -32,7 +32,7 @@
   become: true
   command: >-
     {{ kolla_container_engine }} exec {{ mariadb_service.container_name }}
-    mysql -uroot -p{{ database_password }}
+    mariadb -uroot -p{{ database_password }}
     -h {{ api_interface_address }} -P {{ mariadb_port }}
     --silent --skip-column-names
     -e 'SHOW STATUS LIKE "wsrep_local_state_comment"'

diff --git a/ansible/roles/mariadb/templates/mariadb.json.j2 b/ansible/roles/mariadb/templates/mariadb.json.j2
@@ -1,6 +1,6 @@
 {% set mysql_dir = 'mysql' if kolla_base_distro in ['ubuntu', 'debian'] else '' %}
 {
-    "command": "/usr/bin/mysqld_safe",
+    "command": "/usr/bin/mariadbd-safe",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/galera.cnf",