summaryrefslogtreecommitdiffstats
path: root/catalog-fe
diff options
context:
space:
mode:
authork.kedron <k.kedron@partner.samsung.com>2020-03-25 15:29:42 +0100
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-03-30 14:22:08 +0000
commit55afecde29eb4c383d11d5efa3470d156b169c25 (patch)
treebb60bc143ed5103ac4d1526b22e3eb77cd9d693f /catalog-fe
parentb6a282ed0f584cff4aa4b571bf826bf546616d2a (diff)
Updated the sdc cert
Also bumping version Issue-ID: SDC-2855 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I1ee3f155ca50edee4a47b8585d95f9a3f848b94a (cherry picked from commit a22105ea1e73575bd312450956e6cb6cb51b93a9)
Diffstat (limited to 'catalog-fe')
-rw-r--r--catalog-fe/pom.xml2
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb6
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.p12bin4459 -> 4443 bytes
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/org.onap.sdc.trust.jksbin1413 -> 1413 bytes
-rw-r--r--catalog-fe/sdc-frontend/startup.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 8d17dfa975..ce30342eb4 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
</parent>
<dependencies>
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
index 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
Binary files 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 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
Binary files differ
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