aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/charts/policy-common
diff options
context:
space:
mode:
authorMichael Mokry <mm117s@att.com>2018-08-22 10:58:31 -0500
committerMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-08-30 00:30:15 +0000
commit3efae0b0708a357ad6c965414152941e21c9813f (patch)
treefe7b81d80b8e79c52fe9844795bdd729a8a36af2 /kubernetes/policy/charts/policy-common
parent20bb5cdd606bbc65ef4bf13defef674d9f6934cf (diff)
OOM changes to support PE https
Made changes to the conf files and scripts to set installation variables and use https in urls Made changes to push-policies.sh and drools base.conf Change-Id: If06b91c7cd2f26f08dfabc1054b03f2813224ace Issue-ID: POLICY-781 Signed-off-by: Michael Mokry <mm117s@att.com>
Diffstat (limited to 'kubernetes/policy/charts/policy-common')
-rw-r--r--kubernetes/policy/charts/policy-common/resources/config/pe/base.conf1
-rw-r--r--kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh12
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.