commit 5ad35083ce619749401045d53b59555b9c1c90ac
author Oleksii Grudev <ogrudev@mirantis.com> Thu Sep 20 11:19:32 2018 +0300
committer Oleksii Grudev <ogrudev@mirantis.com> Thu Sep 20 11:19:32 2018 +0300
tree 953608660415afcc8fb9b8bacefa400bd1741a2e
parent d3ebf88bd7cd15a78abe97bc34a1fc3fb49958b3

Set default cacert file if not defined

Change-Id: Ie5c0e7ac4065f6f53b6b2d223d52f350b16033ba
Related-PROD: PROD-23269

gnocchi/files/4.0/gnocchi.conf

diff --git a/gnocchi/files/4.0/gnocchi.conf b/gnocchi/files/4.0/gnocchi.conf
index 66eddc7..4e7edc0 100644
--- a/gnocchi/files/4.0/gnocchi.conf
+++ b/gnocchi/files/4.0/gnocchi.conf
@@ -6,7 +6,7 @@
 {%- if _database.get('x509',{}).get('enabled',False) %}
   {%- set connection_x509_ssl_option = '&ssl_ca=' ~ _database.x509.ca_file ~ '&ssl_cert=' ~ _database.x509.cert_file ~ '&ssl_key=' ~ _database.x509.key_file %}
 {%- elif _database.get('ssl',{}).get('enabled',False) %}
-  {%- set connection_x509_ssl_option = '&ssl_ca=' ~ _database.ssl.cacert_file %}
+  {%- set connection_x509_ssl_option = '&ssl_ca=' ~ _database.ssl.get('cacert_file', cfg.cacert_file) %}
 {%- endif %}
 
 [DEFAULT]

gnocchi/files/4.2/gnocchi.conf

diff --git a/gnocchi/files/4.2/gnocchi.conf b/gnocchi/files/4.2/gnocchi.conf
index 00d4208..7b1a934 100644
--- a/gnocchi/files/4.2/gnocchi.conf
+++ b/gnocchi/files/4.2/gnocchi.conf
@@ -6,7 +6,7 @@
 {%- if _database.get('x509',{}).get('enabled',False) %}
   {%- set connection_x509_ssl_option = '&ssl_ca=' ~ _database.x509.ca_file ~ '&ssl_cert=' ~ _database.x509.cert_file ~ '&ssl_key=' ~ _database.x509.key_file %}
 {%- elif _database.get('ssl',{}).get('enabled',False) %}
-  {%- set connection_x509_ssl_option = '&ssl_ca=' ~ _database.ssl.cacert_file %}
+  {%- set connection_x509_ssl_option = '&ssl_ca=' ~ _database.ssl.get('cacert_file', cfg.cacert_file) %}
 {%- endif %}
 
 [DEFAULT]