diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-08-30 21:55:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-30 21:55:23 +0000 |
| commit | 1b085c1fb1ebc09c535f0c29e12af902556c731c (patch) | |
| tree | 88d88b5a5c5cb6b276c11add6bec73bac60d1099 /kubernetes/policy/charts/policy-common/resources/config | |
| parent | 14972704de8a2905a5777d85e381d8b4e482ac68 (diff) | |
| parent | 3efae0b0708a357ad6c965414152941e21c9813f (diff) | |
Merge "OOM changes to support PE https"
Diffstat (limited to 'kubernetes/policy/charts/policy-common/resources/config')
| -rw-r--r-- | kubernetes/policy/charts/policy-common/resources/config/pe/base.conf | 1 | ||||
| -rw-r--r-- | kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf b/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf index c5dd8ca2a7..be18e55746 100644 --- a/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf +++ b/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf @@ -16,6 +16,7 @@ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 POLICY_HOME=/opt/app/policy POLICY_LOGS=/var/log/onap KEYSTORE_PASSWD=Pol1cy_0nap +TRUSTSTORE_PASSWD=Pol1cy_0nap JDBC_DRIVER=org.mariadb.jdbc.Driver JDBC_URL=jdbc:mariadb://{{ .Values.global.mariadb.nameOverride }}:{{.Values.config.mariadbPort}}/onap_sdk?connectTimeout=30000&socketTimeout=60000&log=true&sessionVariables=max_statement_time=30 diff --git a/kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh b/kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh index defae52b4b..fc27782a2d 100644 --- a/kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh +++ b/kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh @@ -59,9 +59,15 @@ else . /opt/app/policy/etc/profile.d/env.sh # install keystore - #changed to use http instead of http, so keystore no longer needed - #cp config/policy-keystore.jks $POLICY_HOME/etc/ssl/policy-keystore - + # override the policy keystore and truststore if present + if [[ -f config/policy-keystore ]]; then + cp config/policy-keystore $POLICY_HOME/etc/ssl + fi + + if [[ -f config/policy-truststore ]]; then + cp -f config/policy-truststore $[POLICY_HOME]/etc/ssl + fi + if [[ -f config/$container-tweaks.sh ]] ; then # file may not be executable; running it as an # argument to bash avoids needing execute perms. |