From 6aceaee4ad2d755d4e5a7c584d490c7e82257d7c Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Sun, 15 Mar 2020 08:40:33 +0800 Subject: [PATCH] Use proper es schema in fluentd when use internal tls Fix elasticsearch schema in fluentd when kolla_enable_tls_internal is true. Change-Id: I51286d2def7a762d569740c1abc5b924b682ad9d Closes-Bug: #1867481 --- ansible/roles/common/defaults/main.yml | 2 +- ...fix-elasticsearch-schema-in-fluentd-32401e37e42c1b4c.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-elasticsearch-schema-in-fluentd-32401e37e42c1b4c.yaml diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml index 60db9bf3ed..7114a791b7 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -39,7 +39,7 @@ common_services: ####################### fluentd_elasticsearch_path: "" -fluentd_elasticsearch_scheme: "http" +fluentd_elasticsearch_scheme: "{{ internal_protocol }}" fluentd_elasticsearch_user: "" fluentd_elasticsearch_password: "" fluentd_elasticsearch_ssl_version: "TLSv1_2" diff --git a/releasenotes/notes/fix-elasticsearch-schema-in-fluentd-32401e37e42c1b4c.yaml b/releasenotes/notes/fix-elasticsearch-schema-in-fluentd-32401e37e42c1b4c.yaml new file mode 100644 index 0000000000..a67e2290c8 --- /dev/null +++ b/releasenotes/notes/fix-elasticsearch-schema-in-fluentd-32401e37e42c1b4c.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fix elasticsearch schema in fluentd when ``kolla_enable_tls_internal`` is + true.