summaryrefslogtreecommitdiffstats
path: root/catalog-be
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-be
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-be')
-rw-r--r--catalog-be/pom.xml2
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb6
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12bin4459 -> 4443 bytes
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jksbin1413 -> 1413 bytes
-rw-r--r--catalog-be/sdc-backend/startup.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index e3342c3337..767e851045 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
</parent>
<properties>
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
index 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
Binary files 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 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
Binary files differ
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} "