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

openstack · Dec 3, 2024 · 6c61c43 · 6c61c43
2 parents a11a043 + 624056b
commit 6c61c43
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -86,7 +86,7 @@ database_port: "3306"
 database_connection_recycle_time: 10
 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_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

diff --git a/ansible/roles/proxysql-config/defaults/main.yml b/ansible/roles/proxysql-config/defaults/main.yml
@@ -1,6 +1,5 @@
 ---
 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
 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 %}"

diff --git a/ansible/roles/proxysql-config/templates/users.yaml.j2 b/ansible/roles/proxysql-config/templates/users.yaml.j2
@@ -25,7 +25,4 @@ mysql_users:
 {% endif %}
     transaction_persistent: 1
     active: 1
-{% if database_enable_tls_internal | bool and proxysql_project_database_internal_tls_enable | bool %}
-    use_ssl: 1
-{% endif %}
 {% endfor %}
diff --git a/releasenotes/notes/bug-2086466-dc13b40f8da39542.yaml b/releasenotes/notes/bug-2086466-dc13b40f8da39542.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes proxysql-config's TLS DB configuration.
+    `LP#2086466 <https://launchpad.net/bugs/#2086466>`__