openstack/kolla-ansible
Code Issues Proposed changes

Fix octavia's proxysql configuration

Browse Source 
The patch [1] mentioned below added the jobboard
functionality to the octavia role, but unfortunately
it incorrectly implemented the functionality of users
and rules for proxysql.

This patch fixes this bug.

[1] https://review.opendev.org/c/openstack/kolla-ansible/+/888588

Closes-Bug: #2044293
Change-Id: I6524fabad19b438113db4affe05f5586db99dff4
This commit is contained in:
Michal Arbet 2023-11-22 20:49:32 +01:00
parent e9dd15967b
commit ff7856258e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/roles/octavia/defaults/main.yml
View File

@ -86,21 +86,17 @@ octavia_persistence_database_address: "{{ octavia_database_address }}"
#################### ####################
octavia_database_shard_root_user: "{% if enable_proxysql | bool %}root_shard_{{ octavia_database_shard_id }}{% else %}{{ database_user }}{% endif %}" octavia_database_shard_root_user: "{% if enable_proxysql | bool %}root_shard_{{ octavia_database_shard_id }}{% else %}{{ database_user }}{% endif %}"
octavia_database_shard_id: "{{ mariadb_default_database_shard_id | int }}" octavia_database_shard_id: "{{ mariadb_default_database_shard_id | int }}"
octavia_persistence_database_shard_root_user: "{% if enable_proxysql | bool %}root_shard_{{ octavia_persistence_database_shard_id }}{% else %}{{ database_user }}{% endif %}"
octavia_persistence_database_shard_id: "{{ octavia_database_shard_id | int }}"
octavia_database_shard: octavia_database_shard:
users: users:
- user: "{{ octavia_database_user }}" - user: "{{ octavia_database_user }}"
password: "{{ octavia_database_password }}" password: "{{ octavia_database_password }}"
rules:
- schema: "{{ octavia_database_name }}"
shard_id: "{{ octavia_database_shard_id }}"
octavia_persistence_database_shard_root_user: "{{ octavia_database_shard_root_user }}"
octavia_persistence_database_shard_id: "{{ octavia_database_shard_id }}"
octavia_persistence_database_shard:
users:
- user: "{{ octavia_persistence_database_user }}" - user: "{{ octavia_persistence_database_user }}"
password: "{{ octavia_persistence_database_password }}" password: "{{ octavia_persistence_database_password }}"
rules: rules:
- schema: "{{ octavia_database_name }}"
shard_id: "{{ octavia_database_shard_id }}"
- schema: "{{ octavia_persistence_database_name }}" - schema: "{{ octavia_persistence_database_name }}"
shard_id: "{{ octavia_persistence_database_shard_id }}" shard_id: "{{ octavia_persistence_database_shard_id }}"