From: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Date: Mon, 21 Oct 2019 18:38:36 +0000 (+0000)
Subject: Merge "Add missing Optimization base policy type"
X-Git-Tag: 2.2.0~43
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dbf35255904b88111ef4ade980d2f7f851ca4ea0;hp=232e832859eaf1b314d471d5a3ed5089fcb36384;p=policy%2Fapi.git

Merge "Add missing Optimization base policy type"
---

diff --git a/packages/policy-api-docker/src/main/docker/policy-api.sh b/packages/policy-api-docker/src/main/docker/policy-api.sh
index ff7f6b99..e2242dda 100644
--- a/packages/policy-api-docker/src/main/docker/policy-api.sh
+++ b/packages/policy-api-docker/src/main/docker/policy-api.sh
@@ -40,4 +40,14 @@ fi
 
 echo "Policy api config file: $CONFIG_FILE"
 
+if [[ -f "${POLICY_HOME}"/etc/mounted/policy-truststore ]]; then
+    echo "overriding policy-truststore"
+    cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore  "${TRUSTSTORE}"
+fi
+
+if [[ -f "${POLICY_HOME}"/etc/mounted/policy-keystore ]]; then
+    echo "overriding policy-keystore"
+    cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore  "${KEYSTORE}"
+fi
+
 $JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.api.main.startstop.Main -c $CONFIG_FILE