From ed6c5b19b6ee4d638775bf766deae646de688716 Mon Sep 17 00:00:00 2001
From: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Date: Wed, 13 Mar 2019 15:35:35 +0000
Subject: [PATCH] Update ES config in Search data service for HTTPS

updating properties to communicate to ES over https
updating keystore to include ES trust cert

Change-Id: Ia60aa2e3db0a1e98dcd0b0cf51e5e28200a855c3
Issue-ID: AAI-2203
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
---
 .../resources/config/auth/tomcat_keystore             | Bin 2214 -> 3117 bytes
 .../resources/config/elastic-search.properties        |   6 ++++++
 2 files changed, 6 insertions(+)

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 9eec841aa2c1243b5ca3e22b0b116e5bca2afd49..842afebdf90eeb0a61f4dde01fd1772d8f7b78f5 100644
GIT binary patch
delta 923
zcmZ1`xK^V6-`jt085kIt;FvYFI59Dkfq^lz=tzGm18anysevT}19PT96LYFT6O-=(
zW+p}^CProhUN%mxHjlRNyo`+8tPBRuhP(#cY|No7Ts$oKd5Hyv5(Z)*E;kQ9h^r8s
znVy%Km#*OK2$Nyv;dexnGLRGJHMBG^GBh?cH#9djixTHGG6Zsspj-n1Lp}o@kg?3d
z5SLCiWmBwQw<9-a-ttGP4c#@F%<Bafueeh3Q`)@L^o@GL-X;E%9!5_3uj$FBvd*wn
zEkoHoE2}#&=Zw}>#;&%vI--#xmCBB0#d8kqh@NlP+Vy{5Z$^d5`Yx?=%6!|xmdBZI
zdG5Di%2$srrL#2?Uat+_rJ#_OJagrY`@*WBeo3<~|1at+tPlRvK5MS_TU-7skx!JK
z><iCTi?TfSDeg+}#1O&6)Yn>FJWTqNnM9|@rFs33QT~2JB{c5g&3DOqm*=N#(VAky
z$Mas^FKfaAm9Aw!+6vR|82)(qT%Iko=2eis$&)8F6P;7}UM}xmR@pG6dY19Gy4|P3
zGlLJa9P3PtJ-p6+=a;Jb9DXKdMh3>kjnfPoCmZkq!$+2%k?}tZ3o{ez0s~GEUzml-
zfWbf(#8hPwGZ10p&}L&~Wo2h(gtM3+(tIppEFx*8J?HIQ&PT7SOzuhD;Lj(Ry2QXh
z9;92D1sJgnBJMLgUb_Ui&U3oB!mD1o{Y!s^;LR!nagYi@76AjkCP?&juxc^0u(F~h
z7Um{KMh0v5sLfTq@eF!*we}}TD*a18^7F#1R)uAM;}$<ExxMN2Jhij?=XKw|)^*2h
z@z0OJlPz}jXtgd0RF&(Hcbi;!Mk^@L!Y6c6c;Wo0`eo0SdZw^`kn?3sxT0NbAabU1
z;r#}SETz5o*+sUV@)d9TcScRW`a)1I^Mzh^y>nMW8{1#(R581IP$Q{6e}_u5sCw6C
zP4D1)X~&Q9?K<UgVrKVIP5ymTeX|bADVQcbc{s7+TZe_eM&xC|o3a7^N1SD*W&CHA
zXnC_%Y_G<OrFQ04Dk-O`Ryx01$etD1JU>pwbGm2CgL}8b9AC$1sm5wLJZyeZVcStQ
v@zwGF3tur9v>3lRBYLu}cOy?5hlr|Q>Svh<M$@j1f$t0_Zr$bSxwsMlb0<}q

delta 43
ycmZ20u}qNX-`jt085kItfS7UfWac&wk#hZ}6aT+&66d=)e^1+SmaYBL>Y@N|YY{2{

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
+
-- 
2.16.6