From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Thu, 14 Mar 2019 11:30:17 +0000 (+0000)
Subject: Merge "Update ES config in Search data service for HTTPS"
X-Git-Tag: 4.0.0-ONAP~318
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e7b54f7aadaa2b4ed550a2418bda11ccbfecf2f0;hp=89bbe62c01501d438c2b88e79463b30ed8140bc0;p=oom.git

Merge "Update ES config in Search data service for HTTPS"
---

diff --git a/kubernetes/aai/charts/aai-search-data/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-search-data/resources/config/auth/tomcat_keystore
index 9eec841aa2..842afebdf9 100644
Binary files a/kubernetes/aai/charts/aai-search-data/resources/config/auth/tomcat_keystore and b/kubernetes/aai/charts/aai-search-data/resources/config/auth/tomcat_keystore differ
diff --git a/kubernetes/aai/charts/aai-search-data/resources/config/elastic-search.properties b/kubernetes/aai/charts/aai-search-data/resources/config/elastic-search.properties
index 809b22b074..6232c149bc 100644
--- a/kubernetes/aai/charts/aai-search-data/resources/config/elastic-search.properties
+++ b/kubernetes/aai/charts/aai-search-data/resources/config/elastic-search.properties
@@ -17,3 +17,9 @@
 es.cluster-name=ES_AAI
 es.ip-address=aai-elasticsearch.{{.Release.Namespace}}
 es.http-port={{ .Values.config.elasticsearchHttpPort }}
+es.uri-scheme=https
+es.auth-user=admin
+es.auth-password=OBF:1u2a1toa1w8v1tok1u30
+es.trust-store=auth/tomcat_keystore
+es.trust-store-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+