| commit | 723a5ee545eb8d748f32bd1ef6aa3c9fc577dcc8 | [log] [tgz] |
|---|---|---|
| author | Mykyta Karpin <mkarpin@mirantis.com> | Thu Jun 14 22:13:37 2018 +0300 |
| committer | Mykyta Karpin <mkarpin@mirantis.com> | Thu Jun 14 22:13:37 2018 +0300 |
| tree | 06ddbc373a5fb539721e49b6bd84412dfdc25524 | |
| parent | f7234a30b172f5f2b99aaa1a4325ae07e7840b4f [diff] |
[QUEENS] Fix cacert file Change-Id: I7f50d6b8383f698bd645dc90466460f65b12c2cf Related-Prod: https://mirantis.jira.com/browse/PROD-20721
diff --git a/ceilometer/files/queens/ceilometer-agent.conf.Debian b/ceilometer/files/queens/ceilometer-agent.conf.Debian index 7a10276..6ae28d2 100644 --- a/ceilometer/files/queens/ceilometer-agent.conf.Debian +++ b/ceilometer/files/queens/ceilometer-agent.conf.Debian
@@ -353,6 +353,7 @@ # From ceilometer-auth # {%- set _data = agent.identity %} +{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': agent.cacert_file}) %}{% endif %} {%- set auth_type = _data.get('auth_type', 'password') %} {%- include "oslo_templates/files/queens/keystoneauth/_type_" + auth_type + ".conf" %}
diff --git a/ceilometer/files/queens/ceilometer-server.conf.Debian b/ceilometer/files/queens/ceilometer-server.conf.Debian index c86fc81..e4ea563 100644 --- a/ceilometer/files/queens/ceilometer-server.conf.Debian +++ b/ceilometer/files/queens/ceilometer-server.conf.Debian
@@ -349,6 +349,7 @@ # From ceilometer-auth # {%- set _data = server.identity %} +{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': server.cacert_file}) %}{% endif %} {%- set auth_type = _data.get('auth_type', 'password') %} {%- include "oslo_templates/files/queens/keystoneauth/_type_" + auth_type + ".conf" %}