diff options
| author | Zuul <zuul@review.opendev.org> | 2025-10-13 13:47:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-10-13 13:47:10 +0000 |
| commit | 6bd76a1a9e6e4ebed582f677361323d02c4f0d46 (patch) | |
| tree | 54b6c8f9600520f68ef9d42e52875796ebc24a66 /ansible/group_vars | |
| parent | 7be89bf91e9bcf748bfc2e10dc6d97d73829935c (diff) | |
| parent | 7beb0c8d80a7018c24aa964045008610931094b8 (diff) | |
| download | kolla-ansible-6bd76a1a9e6e4ebed582f677361323d02c4f0d46.tar.gz kolla-ansible-6bd76a1a9e6e4ebed582f677361323d02c4f0d46.zip | |
Merge "Drop support for DB Loadbalancing with HAProxy + clustercheck"
Diffstat (limited to 'ansible/group_vars')
| -rw-r--r-- | ansible/group_vars/all/mariadb.yml | 7 | ||||
| -rw-r--r-- | ansible/group_vars/all/proxysql.yml | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ansible/group_vars/all/mariadb.yml b/ansible/group_vars/all/mariadb.yml index ea6c9fda9..5a5439fea 100644 --- a/ansible/group_vars/all/mariadb.yml +++ b/ansible/group_vars/all/mariadb.yml @@ -18,10 +18,9 @@ mariadb_port: "{{ database_port }}" mariadb_wsrep_port: "4567" mariadb_ist_port: "4568" mariadb_sst_port: "4444" -mariadb_clustercheck_port: "4569" mariadb_enable_tls_backend: "{{ database_enable_tls_backend }}" -mariadb_monitor_user: "{{ 'monitor' if enable_proxysql | bool else 'haproxy' }}" +mariadb_monitor_user: "monitor" mariadb_datadir_volume: "mariadb" @@ -30,8 +29,8 @@ mariadb_default_database_shard_hosts: "{% set default_shard = [] %}{% for host i mariadb_shard_id: "{{ mariadb_default_database_shard_id }}" mariadb_shard_name: "shard_{{ mariadb_shard_id }}" mariadb_shard_group: "mariadb_{{ mariadb_shard_name }}" -mariadb_loadbalancer: "{{ 'proxysql' if enable_proxysql | bool else 'haproxy' }}" -mariadb_backup_target: "{{ 'active' if mariadb_loadbalancer == 'haproxy' else 'replica' }}" +mariadb_loadbalancer: proxysql +mariadb_backup_target: replica mariadb_shard_root_user_prefix: "root_shard_" mariadb_shard_backup_user_prefix: "backup_shard_" mariadb_shards_info: "{{ groups['mariadb'] | database_shards_info() }}" diff --git a/ansible/group_vars/all/proxysql.yml b/ansible/group_vars/all/proxysql.yml index 822483d09..386a9be56 100644 --- a/ansible/group_vars/all/proxysql.yml +++ b/ansible/group_vars/all/proxysql.yml @@ -1,4 +1,4 @@ --- -enable_proxysql: "yes" +enable_proxysql: "{{ enable_mariadb }}" proxysql_admin_port: "6032" |