diff options
| author |   liamfallon <liam.fallon@est.tech> | 2022-12-05 09:27:57 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2022-12-05 09:28:03 +0000 |
| commit | edb2c955aac71ad6de87e70383806b76b80c3b66 (patch) | |
| tree | a50a2277992a7f5ef2f70719501debd82938eea1 /packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh | |
| parent | 9bacaaf9102fc42146bd2341f5c0574f3d3545f4 (diff) | |
Fix configuration to use configured propertiesistanbul
The configuration of the control loop microservices in Istanbul always
uses the default configuration files even if they are overridden. The
CSITs are failing becasue the microservices continue to look for
keystore and truststore files even though the tests are configured to
use HTTP.
Issue-ID: POLICY-4471
Change-Id: I9c7aa72b9b8bd4e3e28b97cf4a9ac00dfa16b1cc
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh')
| -rw-r--r-- | packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh index 551167bd7..f5c533fc9 100644 --- a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh +++ b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh @@ -27,15 +27,13 @@ TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" if [ "$#" -eq 1 ]; then CONFIG_FILE=$1 -else - CONFIG_FILE=${CONFIG_FILE} fi if [ -z "$CONFIG_FILE" ]; then CONFIG_FILE="${POLICY_HOME}/etc/ClRuntimeParameters.yaml" fi -echo "Policy clamp config file: $CONFIG_FILE" +echo "Policy clamp Control Loop Runtime config file: $CONFIG_FILE" if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then echo "overriding policy-truststore" @@ -52,10 +50,6 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/ fi -touch /app/app.jar -mkdir -p "${POLICY_HOME}"/config/ -cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/ClRuntimeParameters.yaml - $JAVA_HOME/bin/java \ -Dserver.ssl.keyStore="${KEYSTORE}" \ -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ @@ -68,4 +62,4 @@ $JAVA_HOME/bin/java \ -Dcom.sun.management.jmxremote.authenticate=false \ -Dcom.sun.management.jmxremote.local.only=false \ -jar /app/app.jar \ - --spring.config.location="${POLICY_HOME}/config/ClRuntimeParameters.yaml" + --spring.config.location="${CONFIG_FILE}" |