commit 09f7a3ffc73d8177cf838d2656a7283037ef98d1
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Jun 15 06:33:25 2018 +0000
committer Gerrit Code Review <gerrit2@99e8dbefe3b7> Fri Jun 15 06:33:25 2018 +0000
tree 9874ee6fec8fc0b390452d5a03010bca669d2d76
parent 159c254a4844289a89d8183277790b7a5814a909
parent b3bc451fe544cf48f06f1bf5091c24a814436e43

Merge "[QUEENS] Fix cacert file"

nova/files/queens/nova-compute.conf.Debian

diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index 3c22d9f..afaafb7 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -11104,6 +11104,7 @@
 
 [keystone_authtoken]
 {%- set _data = compute.identity %}
+{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': compute.cacert_file}) %}{% endif %}
 {%- set auth_type = _data.get('auth_type', 'password') %}
 {%- include "oslo_templates/files/queens/keystonemiddleware/_auth_token.conf" %}
 {%- include "oslo_templates/files/queens/keystoneauth/_type_" + auth_type + ".conf" %}

nova/files/queens/nova-controller.conf.Debian

diff --git a/nova/files/queens/nova-controller.conf.Debian b/nova/files/queens/nova-controller.conf.Debian
index 8883c82..e339d2d 100644
--- a/nova/files/queens/nova-controller.conf.Debian
+++ b/nova/files/queens/nova-controller.conf.Debian
@@ -11007,6 +11007,7 @@
 
 [keystone_authtoken]
 {%- set _data = controller.identity %}
+{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': controller.cacert_file}) %}{% endif %}
 {%- set auth_type = _data.get('auth_type', 'password') %}
 {%- include "oslo_templates/files/queens/keystonemiddleware/_auth_token.conf" %}
 {%- include "oslo_templates/files/queens/keystoneauth/_type_" + auth_type + ".conf" %}