Fix protocol and cacert for nova section
Since Queens protocol and cacert is taken from compute section,
in order have smooth upgrade from Pike to Queens, these options
should be taken from server.identity section if not defined in
compute.
Change-Id: I0e64e56962a515a6a3859c555368374ea1b7080c
Related-Prod: https://mirantis.jira.com/browse/PROD-21416
diff --git a/neutron/files/queens/neutron-server.conf.Debian b/neutron/files/queens/neutron-server.conf.Debian
index 5a5fb50..e68d3a9 100644
--- a/neutron/files/queens/neutron-server.conf.Debian
+++ b/neutron/files/queens/neutron-server.conf.Debian
@@ -438,6 +438,8 @@
[nova]
{%- set _data = server.get('compute', server.get('identity', {})) %}
+{%- if 'protocol' not in _data.keys() %}{% do _data.update({'protocol': server.get('identity', {}).get('protocol', 'http')}) %}{% endif %}
+{%- 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" %}