openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix kibana deployment with openstack_cacert unset"

Browse Source
This commit is contained in:
Zuul 2020-04-20 16:19:04 +00:00 committed by Gerrit Code Review
commit 95471c47cc
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/kibana/templates/kibana.yml.j2
View File

@ -6,4 +6,6 @@ elasticsearch.url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_addre
elasticsearch.requestTimeout: {{ kibana_elasticsearch_request_timeout }}
elasticsearch.shardTimeout: {{ kibana_elasticsearch_shard_timeout }}
elasticsearch.ssl.verificationMode: "{{ 'full' if kibana_elasticsearch_ssl_verify | bool else 'none' }}"
{% if openstack_cacert | length > 0 %}
elasticsearch.ssl.certificateAuthorities: {{ openstack_cacert }}
{% endif %}

6
releasenotes/notes/kibana-no-cacert-1994d03bc915dfc0.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue with Kibana deployment when ``openstack_cacert`` is unset.
See `bug 1864180 <https://bugs.launchpad.net/kolla-ansible/+bug/1864180>`_
for details.