openstack/kolla-ansible
Code Issues Proposed changes

Merge "mariadb: switch to use mariadb flavored commands"

Browse Source
This commit is contained in:
Zuul 2024-12-03 20:53:19 +00:00 committed by Gerrit Code Review
commit 97e69bc0b2
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/mariadb/handlers/main.yml
View File

@ -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

2
ansible/roles/mariadb/tasks/check.yml
View File

@ -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

2
ansible/roles/mariadb/tasks/lookup_cluster.yml
View File

@ -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

4
ansible/roles/mariadb/tasks/recover_cluster.yml
View File

@ -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

2
ansible/roles/mariadb/tasks/restart_services.yml
View File

@ -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"'

2
ansible/roles/mariadb/templates/mariadb.json.j2
View File

@ -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",