diff options
| author |   rajeevme <rajeev.mehta@amdocs.com> | 2019-09-28 00:05:44 +0530 |
|---|---|---|
| committer |   James Forsyth <jf2512@att.com> | 2019-10-08 12:43:55 +0000 |
| commit | 15f4526ce3bd81e8e6741bef96dfb26671e0f67a (patch) | |
| tree | 2fefafe0ab3589728b5ba13c4ad52a5219d5a566 /components/aai-elasticsearch/resources/bin | |
| parent | d68960684392a6da61805e4161ae032549db6102 (diff) | |
[AAI-2617] Search guard is no longer available5.1.0-ONAP5.0.2-ONAP5.0.1-ONAP
Change-Id: I5cc786073ac27d3d36d05f0aa89ac5b7f1aadc02
Signed-off-by: rajeevme<rajeev.mehta@amdocs.com>
Change-Id: I6b8ce9867d8b1d8108fcd7002e84f798a5b4e8e2
(cherry picked from commit 360d63a7609c566a6b8043a7de70ae35bd1f258a)
Diffstat (limited to 'components/aai-elasticsearch/resources/bin')
3 files changed, 0 insertions, 28 deletions
diff --git a/components/aai-elasticsearch/resources/bin/init_sg.sh b/components/aai-elasticsearch/resources/bin/init_sg.sh deleted file mode 100644 index e859365..0000000 --- a/components/aai-elasticsearch/resources/bin/init_sg.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -/usr/share/elasticsearch/plugins/search-guard-6/tools/sgadmin.sh \ - -cd /usr/share/elasticsearch/config/sg \ - -ks /usr/share/elasticsearch/config/sg/auth/{{ .Values.config.adminKeyStore }} \ - -ts /usr/share/elasticsearch/config/sg/auth/{{ .Values.config.trustStore }} \ - -kspass {{ .Values.config.adminKeyStorePassword }} \ - -tspass {{ .Values.config.trustStorePassword}} \ - -nhnv \ - -icl \ - -p {{ .Values.service.internalPort2 }}
\ No newline at end of file diff --git a/components/aai-elasticsearch/resources/bin/run.sh b/components/aai-elasticsearch/resources/bin/run.sh deleted file mode 100644 index a612c74..0000000 --- a/components/aai-elasticsearch/resources/bin/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Wait for ES to start then initialize SearchGuard -/usr/local/bin/docker-entrypoint.sh eswrapper & -/usr/share/elasticsearch/bin/wait_until_started.sh -/usr/share/elasticsearch/bin/init_sg.sh - -wait
\ No newline at end of file diff --git a/components/aai-elasticsearch/resources/bin/wait_until_started.sh b/components/aai-elasticsearch/resources/bin/wait_until_started.sh deleted file mode 100644 index 279253b..0000000 --- a/components/aai-elasticsearch/resources/bin/wait_until_started.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -RET=1 - -while [[ RET -ne 0 ]]; do - echo "Waiting for Elasticsearch to become ready before running sgadmin..." - curl -XGET -k "https://localhost:{{ .Values.service.internalPort }}/" >/dev/null 2>&1 - RET=$? - sleep 5 -done
\ No newline at end of file |