diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-10-06 15:53:20 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-10-06 16:01:00 -0400 |
| commit | 127deeeaae131e544d57c89bcb97604a88b27858 (patch) | |
| tree | aeb7c5d43ecf0b2494bda9497efd7c0ba7680a7e | |
| parent | 0a4e8f4cab30dc183d3f9ae2d1ee3f80c09b536c (diff) | |
Merge ONAP certs into cacerts
Merge ONAP certificates into openjdk cacerts file
Change-Id: I9743442196d85e68d4ca2f2a5df46590d33eec3b
Issue-ID: SDNC-1371
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 80f1fc63b09ab7d987bbaf59f184d6896c561131
| -rw-r--r-- | SdncReports/pom.xml | 2 | ||||
| -rw-r--r-- | admportal/pom.xml | 2 | ||||
| -rw-r--r-- | configbackuprestore/pom.xml | 2 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 3 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/standalone.Dockerfile | 4 | ||||
| -rwxr-xr-x | pom.xml | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index c5d13533..1df53279 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.1</version> <relativePath/> </parent> diff --git a/admportal/pom.xml b/admportal/pom.xml index 01b00c7e..164ae20b 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.1</version> <relativePath/> </parent> diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index c5bef8b3..5851d1b6 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 577cebb2..a4768ba5 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -48,7 +48,8 @@ RUN echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc # Install ssl and java certificates COPY truststoreONAPall.jks $JAVA_SECURITY_DIR COPY truststoreONAPall.jks $SDNC_STORE_DIR -RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit +RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit -noprompt +RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts -deststorepass changeit -noprompt # Secure with TLS RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile index 67381f5c..58907dc1 100755 --- a/installation/sdnc/src/main/docker/standalone.Dockerfile +++ b/installation/sdnc/src/main/docker/standalone.Dockerfile @@ -46,7 +46,9 @@ RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HO # Install ssl and java certificates COPY truststoreONAPall.jks $JAVA_SECURITY_DIR COPY truststoreONAPall.jks $SDNC_STORE_DIR -RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit +RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit -noprompt +RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts -deststorepass changeit -noprompt + # Secure with TLS RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.1</version> <relativePath/> </parent> |