From 6993520f6d1ad135999d43cb717c37e6dedc4a28 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 19 Nov 2020 10:09:21 -0500 Subject: Update installation to handle case /etc/ssl/certs not found Updated ca cert installation to handle case correctly where /etc/ssl/certs directory is not found. Alsp, added integration testing of standalone sdnc container. Change-Id: Iabb3b6f921f52e533f1a920c3afa68a024788667 Issue-ID: SDNC-1419 Signed-off-by: Dan Timoney Former-commit-id: 3ee44123de572df9ff2990ef2aedc0891b658285 --- installation/sdnc/pom.xml | 96 +++++++++++++++++++++- installation/sdnc/src/main/docker/Dockerfile | 5 +- .../sdnc/src/main/docker/standalone.Dockerfile | 5 +- 3 files changed, 99 insertions(+), 7 deletions(-) (limited to 'installation') diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index a0c42a44..ae7c9dda 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -31,7 +31,8 @@ 8443 ${https_proxy} deploy - true + true + true yyyyMMdd'T'HHmmss'Z' @@ -116,6 +117,81 @@ + + start-it-instance + pre-integration-test + + start + + + + + mariadb:10.5 + sdnc-db + + + itsASecret + sdnctl + gamma + sdnctl + + + custom + sdnc + dbhost + sdnctldb01 + sdnctldb02 + + + sdncdb.port:3306 + + + true + + + + + ${image.name}:${project.docker.latesttagtimestamp.version} + sdnc-container + + + itsASecret + sdnctl + gamma + sdnctl + /opt/onap/sdnc/data/properties + INFO + + + sdnc-db + + + custom + sdnc + sdnc + > + + sdnc.port:8181 + + + all warp coils are now operating at peak efficiency + + + + true + + + + + + + + stop-it-instance + post-integration-test + + stop + + push-images ${docker.push.phase} @@ -401,6 +477,24 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + false + + ${sdnc.port} + + + diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index a4768ba5..4ff33ace 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -46,10 +46,9 @@ COPY aaa-app-config.xml $ODL_HOME/etc/opendaylight/datastore/initial/config/ RUN echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties # 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 -noprompt -RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts -deststorepass changeit -noprompt +RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit -noprompt ; fi +RUN keytool -importkeystore -srckeystore $SDNC_STORE_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 58907dc1..5f0f8254 100755 --- a/installation/sdnc/src/main/docker/standalone.Dockerfile +++ b/installation/sdnc/src/main/docker/standalone.Dockerfile @@ -44,10 +44,9 @@ RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all, sdnr-northbound RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg # 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 -noprompt -RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts -deststorepass changeit -noprompt +RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit -noprompt ; fi +RUN keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts -deststorepass changeit -noprompt # Secure with TLS -- cgit 1.2.3-korg