From: k.kedron <k.kedron@partner.samsung.com>
Date: Mon, 9 Sep 2019 14:40:19 +0000 (+0200)
Subject: Updated the sdc cert for ONAP namespace in the kubernetes.
X-Git-Tag: 1.3.3~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bce9b9e3ce359c2d29f1ba2156b41f6fbd8c0c85;p=sdc%2Fdcae-d%2Fdt-be-main.git

Updated the sdc cert for ONAP namespace in the kubernetes.

Issue-ID: SDC-2539
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I1f9100eb66c75edc0aa158cd5a80748547fe9da5
---

diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb
index af6ad1e..ce88cdb 100644
--- a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb
+++ b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb
@@ -12,11 +12,12 @@ default['DCAE']['TOSCA_LAB']['http_port'] = 8085
 default['SDC']['BE']['http_port'] = 8080
 default['SDC']['BE']['https_port'] = 8443
 default['DCAE']['TOSCA_LAB']['https_port'] = 8085
+
+default['jetty'][:keystore_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^"
+default['jetty'][:keymanager_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^"
 # TO CHANGE THE TRUSTSTORE CERT THE JVM CONFIGURATION
 # MUST BE ALSO CHANGE IN THE startup.sh FILE
-default['jetty']['keystore_pwd'] = "rTIS;B4kM]2GHcNK2c3B4&Ng"
-default['jetty']['keymanager_pwd'] = "rTIS;B4kM]2GHcNK2c3B4&Ng"
-default['jetty']['truststore_pwd'] = "Y,f975ZNJfVZhV*{+Y[}pA?0"
+default['jetty'][:truststore_pwd] = "].][xgtze]hBhz*wy]}m#lf*"
 
 default['disableHttp'] = true
 
diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12
index ee000dc..d03ca1c 100644
Binary files a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 and b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 differ
diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks
index 342c4f2..d07ce1a 100644
Binary files a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks and b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks differ
diff --git a/docker/docker_be/startup.sh b/docker/docker_be/startup.sh
index 60ba309..3a2814f 100644
--- a/docker/docker_be/startup.sh
+++ b/docker/docker_be/startup.sh
@@ -4,7 +4,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} -Dconfig.home=${JETTY_BASE}/config \
                -Dlog.home=${JETTY_BASE}/logs \
                -Dlogback.configurationFile=${JETTY_BASE}/dcae-be/logback-spring.xml
                -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \
-               -Djavax.net.ssl.trustStorePassword=Y,f975ZNJfVZhV*{+Y[}pA?0 \
+               -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf* \
                -Djetty.console-capture.dir=${JETTY_BASE}/logs"
 
 cd /root/chef-solo
diff --git a/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks b/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks
old mode 100755
new mode 100644
index 077a7f3..d07ce1a
Binary files a/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks and b/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks differ
diff --git a/docker/docker_tools/startup.sh b/docker/docker_tools/startup.sh
index b9c3ea1..24e4347 100644
--- a/docker/docker_tools/startup.sh
+++ b/docker/docker_tools/startup.sh
@@ -4,7 +4,7 @@ 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"
+               -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf*"
 
 cd /root/chef-solo
 chef-solo -c solo.rb -E ${ENVNAME}