diff options
| author |   k.kedron <k.kedron@partner.samsung.com> | 2019-08-23 17:11:51 +0200 |
|---|---|---|
| committer | k.kedron <k.kedron@partner.samsung.com> | 2019-08-27 17:57:22 +0200 |
| commit | 6fd60f573407abcd258ca4463836328ba039f50e (patch) | |
| tree | 871d5531c0a137d24d28af643edb65ed4ca47625 /docker/startup.sh | |
| parent | c69e72cb78fb8e6d7a4f3698f6598f418fdcb727 (diff) | |
Implement HTTPS calls into DCAE-DS FE
Implemented HTTPS calls into dcae-ds fe:
-Added p12 keystore certificate.
-Updated application configuration.
-Added trust-store.
-Updated the onap/base_sdc-jetty docker image version
-Updated the chef script to properly used of the new docker image
Issue-ID: SDC-2533
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I1bac50ff08aa4f703de458661c9d52f985c4a75d
Diffstat (limited to 'docker/startup.sh')
| -rw-r--r-- | docker/startup.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docker/startup.sh b/docker/startup.sh index 46925ae..8b7d914 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -1,17 +1,18 @@ #!/bin/sh -#set -x -# Run chef-solo for configuration -cd /var/opt/dcae-fe/chef-solo -chef-solo -c solo.rb -E ${ENVNAME} --log_level "debug" --logfile "/tmp/Chef-Solo.log" +JAVA_OPTIONS=" ${JAVA_OPTIONS} -Dconfig.home=${JETTY_BASE}/config + -Dlog.home=${JETTY_BASE}/logs + -Dlogback.configurationFile=${JETTY_BASE}/dcae-fe/logback-spring.xml" + +cd /root/chef-solo +chef-solo -c solo.rb -E ${ENVNAME} status=$? -if [ $status != 0 ]; then +if [[ ${status} != 0 ]]; then echo "[ERROR] Problem detected while running chef. Aborting !" exit 1 fi -# Execute Jetty cd /var/lib/jetty /docker-entrypoint.sh & |