X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-sim%2Fpackages%2Fmodels-simulator-docker%2Fsrc%2Fmain%2Fdocker%2Fsimulators.sh;h=3d382a8761892c975bc5bfd9deea262a55175562;hb=8c8eb415ca57830d462cefbe8d659b3b98b6de7c;hp=fdf680589706ffe297fb7700b9fe7ddaeb54f502;hpb=ed439e7e8dafbdd87ace0604dc6230bb9563f995;p=policy%2Fmodels.git

diff --git a/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh b/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh
index fdf680589..3d382a876 100644
--- a/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh
+++ b/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh
@@ -23,21 +23,43 @@
 # ============LICENSE_END=========================================================
 #
 
-if [ -z "$SIMULATOR_HOME" ]
-then
-    SIMULATOR_HOME=${POLICY_HOME}/simulators
+KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}"
+TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}"
+KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}"
+TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}"
+
+if [ "$#" -ge 1 ]; then
+    CONFIG_FILE=$1
+else
+    CONFIG_FILE=${CONFIG_FILE}
+fi
+
+if [ -z "$CONFIG_FILE" ]; then
+    CONFIG_FILE="${POLICY_HOME}/etc/simParameters.json"
 fi
 
-KEYSTORE="${SIMULATOR_HOME}/etc/ssl/policy-keystore"
-KEYSTORE_PASSWD="Pol1cy_0nap"
-TRUSTSTORE="${SIMULATOR_HOME}/etc/ssl/policy-truststore"
-TRUSTSTORE_PASSWD="Pol1cy_0nap"
+echo "Policy simulator 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
+
+if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
+    echo "overriding logback.xml"
+    cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/
+fi
 
 ${JAVA_HOME}/bin/java \
-    -cp "${SIMULATOR_HOME}/etc:${SIMULATOR_HOME}/lib/*" \
+    -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" \
+    -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \
     -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.models.simulators.Main \
-        ${SIMULATOR_HOME}/etc/mounted/simParameters.json
+    org.onap.policy.models.simulators.Main ${CONFIG_FILE}