openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix proxysql-config's TLS DB configuration"

Browse Source
This commit is contained in:
Zuul 2024-12-03 16:27:20 +00:00 committed by Gerrit Code Review
commit 6c61c43bd5
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -86,7 +86,7 @@ database_port: "3306"
database_connection_recycle_time: 10 database_connection_recycle_time: 10
database_max_pool_size: 1 database_max_pool_size: 1
database_enable_tls_backend: "{{ 'yes' if ((kolla_enable_tls_backend | bool ) and ( enable_proxysql | bool)) else 'no' }}" database_enable_tls_backend: "{{ 'yes' if ((kolla_enable_tls_backend | bool ) and ( enable_proxysql | bool)) else 'no' }}"
database_enable_tls_internal: "{{ 'yes' if ((kolla_enable_tls_backend | bool ) and ( enable_proxysql | bool)) else 'no' }}" database_enable_tls_internal: "{{ 'yes' if ((kolla_enable_tls_internal | bool ) and ( enable_proxysql | bool)) else 'no' }}"
#################### ####################
# Container engine options # Container engine options

1
ansible/roles/proxysql-config/defaults/main.yml
View File

@ -1,6 +1,5 @@
--- ---
proxysql_project_database_shard: "{{ lookup('vars', (kolla_role_name | default(project_name)) + '_database_shard', default=omit) }}" proxysql_project_database_shard: "{{ lookup('vars', (kolla_role_name | default(project_name)) + '_database_shard', default=omit) }}"
proxysql_project_database_internal_tls_enable: "{{ lookup('vars', (kolla_role_name | default(project_name)) + '_database_internal_tls_enable', default='no') }}"
# NOTE(kevko): Kolla_role_name and replace is used only because of nova-cell # NOTE(kevko): Kolla_role_name and replace is used only because of nova-cell
proxysql_project: "{{ kolla_role_name | default(project_name) | replace('_', '-') }}" proxysql_project: "{{ kolla_role_name | default(project_name) | replace('_', '-') }}"
proxysql_config_users: "{% if proxysql_project_database_shard is defined and proxysql_project_database_shard['users'] is defined %}True{% else %}False{% endif %}" proxysql_config_users: "{% if proxysql_project_database_shard is defined and proxysql_project_database_shard['users'] is defined %}True{% else %}False{% endif %}"

3
ansible/roles/proxysql-config/templates/users.yaml.j2
View File

@ -25,7 +25,4 @@ mysql_users:
{% endif %} {% endif %}
transaction_persistent: 1 transaction_persistent: 1
active: 1 active: 1
{% if database_enable_tls_internal | bool and proxysql_project_database_internal_tls_enable | bool %}
use_ssl: 1
{% endif %}
{% endfor %} {% endfor %}

5
releasenotes/notes/bug-2086466-dc13b40f8da39542.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes proxysql-config's TLS DB configuration.
`LP#2086466 <https://launchpad.net/bugs/#2086466>`__