[QUEENS] Implemented secure connection to MySQL.
* It will be check exist x509 section in pillar, and prepare correct _data array for oslo_template.
Related-PROD: PROD-23473
Change-Id: Id5e6c0c9a582ea401e050c7a29c1f1497ad3a5b9
diff --git a/designate/files/queens/designate.conf.Debian b/designate/files/queens/designate.conf.Debian
index 906bf0d..d8c43a4 100644
--- a/designate/files/queens/designate.conf.Debian
+++ b/designate/files/queens/designate.conf.Debian
@@ -488,7 +488,13 @@
[pool_manager_cache:sqlalchemy]
{%- set _data = {} %}
{%- do _data.update({'engine': server.database.engine, 'user': server.database.user, 'password': server.database.password, 'host': server.database.host, 'name': server.database.name.pool_manager})%}
-{%- if _data.ssl is defined and 'cacert_file' not in _data.get('ssl', {}).keys() %}{% do _data['ssl'].update({'cacert_file': server.cacert_file}) %}{% endif %}
+{%- if server.database.x509 is defined %}
+{%- do _data.update({'x509': server.database.x509}) %}
+{%- endif %}
+{%- if server.database.ssl is defined %}
+{%- do _data.update({'ssl': server.database.ssl}) %}
+{%- if 'cacert_file' not in server.database.ssl.keys() %}{% do _data['ssl'].update({'cacert_file': server.cacert_file}) %}{% endif %}
+{%- endif %}
{%- include "oslo_templates/files/queens/oslo/_database.conf" %}
[producer_task:delayed_notify]
@@ -1090,5 +1096,11 @@
[storage:sqlalchemy]
{%- set _data = {} %}
{%- do _data.update({'engine': server.database.engine, 'user': server.database.user, 'password': server.database.password, 'host': server.database.host, 'name': server.database.name.main_database})%}
-{%- if _data.ssl is defined and 'cacert_file' not in _data.get('ssl', {}).keys() %}{% do _data['ssl'].update({'cacert_file': server.cacert_file}) %}{% endif %}
+{%- if server.database.x509 is defined %}
+{%- do _data.update({'x509': server.database.x509}) %}
+{%- endif %}
+{%- if server.database.ssl is defined %}
+{%- do _data.update({'ssl': server.database.ssl}) %}
+{%- if 'cacert_file' not in server.database.ssl.keys() %}{% do _data['ssl'].update({'cacert_file': server.cacert_file}) %}{% endif %}
+{%- endif %}
{%- include "oslo_templates/files/queens/oslo/_database.conf" %}