diff options
17 files changed, 15 insertions, 15 deletions
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 106400c799..d8c737728d 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 @@ -13,11 +13,11 @@ default['disableHttp'] = true #+----------------------------------+ default['jetty']['dmaap_truststore_pwd'] = "dmaap_truststore_pwd" -default['jetty'][:keystore_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" -default['jetty'][:keymanager_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" +default['jetty'][:keystore_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" +default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" # TO CHANGE THE TRUSTSTORE CERT THE JVM CONFIGURATION # MUST BE ALSO CHANGE IN THE startup.sh FILE -default['jetty'][:truststore_pwd] = "].][xgtze]hBhz*wy]}m#lf*" +default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0" #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 Binary files differindex d03ca1c91d..446856071b 100644 --- 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 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 Binary files differindex d07ce1a66b..e6686cc08c 100644 --- 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 diff --git a/catalog-be/sdc-backend/startup.sh b/catalog-be/sdc-backend/startup.sh index abb307490f..4f5ef8ca2e 100644 --- a/catalog-be/sdc-backend/startup.sh +++ b/catalog-be/sdc-backend/startup.sh @@ -7,7 +7,7 @@ export JAVA_OPTIONS=" -Dconfig.home=${JETTY_BASE}/config \ -Dartifactgenerator.config=${JETTY_BASE}/config/catalog-be/Artifact-Generator.properties \ -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=].][xgtze]hBhz*wy]}m#lf* \ + -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 \ -Djetty.console-capture.dir=${JETTY_BASE}/logs \ ${JAVA_OPTIONS} " 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 d275a2cb28..4d65cf72c5 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] = "!ppJ.JvWn0hGh)oVF]([Kv)^" -default['jetty'][:keymanager_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" +default['jetty'][:keystore_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" +default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" # TO CHANGE THE TRUSTSTORE CERT THE JVM CONFIGURATION # MUST BE ALSO CHANGE IN THE startup.sh FILE -default['jetty'][:truststore_pwd] = "].][xgtze]hBhz*wy]}m#lf*" +default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0" #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 Binary files differindex d03ca1c91d..446856071b 100644 --- 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 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 Binary files differindex d07ce1a66b..e6686cc08c 100644 --- 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 diff --git a/catalog-fe/sdc-frontend/startup.sh b/catalog-fe/sdc-frontend/startup.sh index dda1e02dbf..9eb742fd2b 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=].][xgtze]hBhz*wy]}m#lf* \ + -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 \ -Djetty.console-capture.dir=${JETTY_BASE}/logs " cd /var/lib/jetty/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 e7b6766ae8..e8c0d36de0 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,9 @@ 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)^" -default['jetty'][:truststore_pwd] = "].][xgtze]hBhz*wy]}m#lf*" +default['jetty'][:keystore_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" +default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" +default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0" default['VnfRepo']['vnfRepoPort'] = 8702 default['VnfRepo']['vnfRepoHost'] = "192.168.50.5" 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 Binary files differindex d03ca1c91d..446856071b 100644 --- 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 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 Binary files differindex d07ce1a66b..e6686cc08c 100644 --- 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 diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/org.onap.sdc.trust.jks b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/org.onap.sdc.trust.jks Binary files differindex d07ce1a66b..e6686cc08c 100644 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/org.onap.sdc.trust.jks +++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/org.onap.sdc.trust.jks diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/org.onap.sdc.trust.jks b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/org.onap.sdc.trust.jks Binary files differindex d07ce1a66b..e6686cc08c 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/org.onap.sdc.trust.jks +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/org.onap.sdc.trust.jks 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 Binary files differindex d03ca1c91d..446856071b 100644 --- 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 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 Binary files differindex d07ce1a66b..e6686cc08c 100644 --- 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 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 728281b559..5b67561b02 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 => "].][xgtze]hBhz*wy]}m#lf*", - :jetty_keystore_pwd => "!ppJ.JvWn0hGh)oVF]([Kv)^", - :jetty_keymanager_pwd => "!ppJ.JvWn0hGh)oVF]([Kv)^", + :jetty_truststore_pwd => "z+KEj;t+,KN^iimSiS89e#p0", + :jetty_keystore_pwd => "?(kP!Yur![*!Y5!E^f(ZKc31", + :jetty_keymanager_pwd => "?(kP!Yur![*!Y5!E^f(ZKc31", }) end diff --git a/utils/webseal-simulator/sdc-simulator/startup.sh b/utils/webseal-simulator/sdc-simulator/startup.sh index 7287b87eda..66add3a75e 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=].][xgtze]hBhz*wy]}m#lf* \ + -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 \ -Djetty.console-capture.dir=${JETTY_BASE}/logs" |