From: k.kedron Date: Mon, 9 Sep 2019 14:40:21 +0000 (+0200) Subject: Updated the sdc cert for ONAP namespace in the kubernetes. X-Git-Tag: 1.6.1~106 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c64cfebff09ac7d71b33788ff8b561f8703a8c9e;p=sdc.git Updated the sdc cert for ONAP namespace in the kubernetes. Issue-ID: SDC-2539 Signed-off-by: Krystian Kedron Change-Id: I4dba563d5dd8b041a2a61076a9ccbabcc4d22316 --- diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index d919088f1d..2640da14ee 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -5,11 +5,11 @@ default['FE'][:http_port] = 8181 default['FE'][:https_port] = 9443 default['disableHttp'] = true default['cassandra'][:truststore_password] = "Aa123456" +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*" #Reserved for DCAE backend default['DCAE']['BE'][:http_port] = 8082 diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12 b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12 index ee000dc749..d03ca1c91d 100644 Binary files a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12 and b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12 differ diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks index 342c4f2ad7..d07ce1a66b 100644 Binary files a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks and b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks differ diff --git a/catalog-be/sdc-backend/startup.sh b/catalog-be/sdc-backend/startup.sh index 1797c75c50..77d4dd5e6a 100644 --- a/catalog-be/sdc-backend/startup.sh +++ b/catalog-be/sdc-backend/startup.sh @@ -6,7 +6,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} \ -Dconfiguration.yaml=${JETTY_BASE}/config/catalog-be/configuration.yaml \ -Donboarding_configuration.yaml=${JETTY_BASE}/config/onboarding-be/onboarding_configuration.yaml \ -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/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb index a7c9ce1d90..d275a2cb28 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb @@ -4,11 +4,11 @@ default['BE'][:https_port] = 8443 default['FE'][:http_port] = 8181 default['FE'][:https_port] = 9443 default['disableHttp'] = true -default['jetty'][:keystore_pwd] = "rTIS;B4kM]2GHcNK2c3B4&Ng" -default['jetty'][:keymanager_pwd] = "rTIS;B4kM]2GHcNK2c3B4&Ng" +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'][:truststore_pwd] = "Y,f975ZNJfVZhV*{+Y[}pA?0" +default['jetty'][:truststore_pwd] = "].][xgtze]hBhz*wy]}m#lf*" #Onboard default['ONBOARDING_BE'][:http_port] = 8081 diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.p12 b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.p12 index ee000dc749..d03ca1c91d 100644 Binary files a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.p12 and b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.p12 differ diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.trust.jks b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.trust.jks index 342c4f2ad7..d07ce1a66b 100644 Binary files a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.trust.jks and b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.trust.jks differ diff --git a/catalog-fe/sdc-frontend/startup.sh b/catalog-fe/sdc-frontend/startup.sh index 99cdaf0f48..6080856f65 100644 --- a/catalog-fe/sdc-frontend/startup.sh +++ b/catalog-fe/sdc-frontend/startup.sh @@ -7,7 +7,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} \ -Dconfiguration.yaml=${JETTY_BASE}/config/catalog-fe/configuration.yaml \ -Donboarding_configuration.yaml=${JETTY_BASE}/config/onboarding-fe/onboarding_configuration.yaml \ -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/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb index 566047da6c..8a7cf208e5 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb @@ -5,9 +5,10 @@ default['FE'][:http_port] = 8181 default['FE'][:https_port] = 9443 default['disableHttp'] = true default['cassandra'][:truststore_password] = "Aa123456" -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'][:keystore_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" +default['jetty'][:keymanager_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" +default['jetty'][:truststore_pwd] = "].][xgtze]hBhz*wy]}m#lf*" + default['VnfRepo']['vnfRepoPort'] = 8702 default['VnfRepo']['vnfRepoHost'] = "192.168.50.5" @@ -22,4 +23,3 @@ default['cassandra']['janusgraph_connection_timeout'] = 10000 #ExternalTesting default['EXTTEST']['ep1_config'] = "vtp,VTP,true,http://192.168.50.5:8702/onapapi/vnfsdk-marketplace,c.*" default['EXTTEST']['ep2_config'] = "repository,Repository,false,,.*" - diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.p12 b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.p12 index ee000dc749..d03ca1c91d 100644 Binary files a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.p12 and b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.p12 differ diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.trust.jks b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.trust.jks index 342c4f2ad7..d07ce1a66b 100644 Binary files a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.trust.jks and b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.trust.jks differ diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 index ee000dc749..d03ca1c91d 100644 Binary files a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 and b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 differ diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.trust.jks b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.trust.jks index 342c4f2ad7..d07ce1a66b 100644 Binary files a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.trust.jks and b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.trust.jks differ diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb index 71366a5148..728281b559 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb @@ -51,9 +51,9 @@ template "ssl-ini" do mode "0755" variables({ :https_port => "8443", - :jetty_truststore_pwd => "Y,f975ZNJfVZhV*{+Y[}pA?0", - :jetty_keystore_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng", - :jetty_keymanager_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng", + :jetty_truststore_pwd => "].][xgtze]hBhz*wy]}m#lf*", + :jetty_keystore_pwd => "!ppJ.JvWn0hGh)oVF]([Kv)^", + :jetty_keymanager_pwd => "!ppJ.JvWn0hGh)oVF]([Kv)^", }) end diff --git a/utils/webseal-simulator/sdc-simulator/startup.sh b/utils/webseal-simulator/sdc-simulator/startup.sh index cc7d9f9e09..7287b87eda 100644 --- a/utils/webseal-simulator/sdc-simulator/startup.sh +++ b/utils/webseal-simulator/sdc-simulator/startup.sh @@ -16,7 +16,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} \ -Dlog.home=${JETTY_BASE}/logs \ -Dlogback.configurationFile=${JETTY_BASE}/config/sdc-simulator/logback.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"