diff options
author | k.kedron <k.kedron@partner.samsung.com> | 2019-09-05 17:50:23 +0200 |
---|---|---|
committer | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-09-06 09:11:47 +0000 |
commit | 176a760ebe4293c19eeb96cf88269215fce870a9 (patch) | |
tree | c559a1f2bafbf6147612b88a46a0299a579af57f /docker/docker_tools/startup.sh | |
parent | 64636c2148414c1fa5da4b46a69570cdab003837 (diff) |
Fully HTTPS support in the dcaedt-tools
Fully HTTPS support:
-Updated the onap/base_sdc-jetty docker image version
-Updated the chef script to properly used of the new docker image
-Updated jvm configuration to support call to
the SDC components using HTTPS.
-Added buildRestClient method to create the DcaeRestClient
supporting the SSL connection
-Checkstyle in the recipes adn tools.Main method
-Update the docker_run.sh:
- Change JAVA_OPTIONS
-Update docker_run script
-Add proper dependency in the pom (waiting for solving the SDC-2554 bug)
Issue-ID: SDC-2552
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: Ie8dd1f54619f1101c13de13ae3cbb296bba57210
Diffstat (limited to 'docker/docker_tools/startup.sh')
-rw-r--r-- | docker/docker_tools/startup.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/docker/docker_tools/startup.sh b/docker/docker_tools/startup.sh index a158317..b9c3ea1 100644 --- a/docker/docker_tools/startup.sh +++ b/docker/docker_tools/startup.sh @@ -1,8 +1,13 @@ #!/bin/sh -set -x -# Run chef-solo for configuration -cd /var/opt/dcae-tools/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 \ + -Djetty.console-capture.dir=${JETTY_BASE}/logs \ + -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \ + -Djavax.net.ssl.trustStorePassword=c+QY7@v1bQ!lo0c4ydi)))AV" + +cd /root/chef-solo +chef-solo -c solo.rb -E ${ENVNAME} status=$? if [[ ${status} != 0 ]]; then @@ -10,8 +15,7 @@ if [[ ${status} != 0 ]]; then exit 1 fi -# Execute DCAE tools -cd /var/opt/dcae-tools/app -java -jar dcaedt_tools.jar conf/environment.json conf/config.json +cd ${JETTY_BASE}/webapps +java ${JAVA_OPTIONS} -jar dcaedt_tools.jar ../conf/environment.json ../conf/config.json exec "$@";
\ No newline at end of file |