Fix TLS enablement

OpenDaylight Scandium release no longer supports enabling TLS via etc/custom.properties file.  Instead, TLS must
be enabled in etc/org.ops4j.pax.web.cfg

Issue-ID: SDNC-1858
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I040835f07b59b0037fca1f9cc554bbbd15a2980a

diff --git a/docs/delivery.rst b/docs/delivery.rst
index ba5d17b..f5c96e0 100644 (file)
--- a/docs/delivery.rst
+++ b/docs/delivery.rst
@@ -14,30 +14,5 @@ Delivery
 
    * This note must be removed after content has been added.
 
-Example use of a block diagram.
 
-.. blockdiag::
-
-
-   blockdiag layers {
-   orientation = portrait
-   a -> m;
-   b -> n;
-   c -> x;
-   m -> y;
-   m -> z;
-   group l1 {
-   color = blue;
-   x; y; z;
-   }
-   group l2 {
-   color = yellow;
-   m; n;
-   }
-   group l3 {
-   color = orange;
-   a; b; c;
-   }
-
-   }
 

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index a8683b4..97f7785 100644 (file)
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,9 +1,9 @@
 sphinx>=4.2.0  # BSD
 sphinx-rtd-theme>=1.0.0  # MIT
-Pillow<10 # Diagram extensions (not compatible with Pillow>=10)
+Pillow # Diagram extensions (not compatible with Pillow>=10)
 sphinxcontrib-blockdiag  # BSD
 sphinxcontrib-seqdiag # BSD
-sphinxcontrib-openapi==0.7.0  # BSD - pinned to avoid sphinx-mdinclude/docutils incompatibility
+sphinxcontrib-openapi
 sphinxcontrib-swaggerdoc  # TODO: Remove in separate change (unmaintained)
 sphinxcontrib-spelling
 sphinxcontrib-plantuml

diff --git a/installation/sdnc/src/main/dc/docker-compose.yaml b/installation/sdnc/src/main/dc/docker-compose.yaml
index 71f2815..6b15e39 100644 (file)
--- a/installation/sdnc/src/main/dc/docker-compose.yaml
+++ b/installation/sdnc/src/main/dc/docker-compose.yaml
@@ -1,8 +1,6 @@
-version: '2.1'
-
 services:
   db:
-    image: mariadb:10.5
+    image: mariadb:11.7.2
     container_name: sdnc_db
     ports:
       - "3306"
@@ -19,7 +17,7 @@ services:
         max-file: "5"
 
   sdnc:
-    image: onap/sdnc-image:latest
+    image: ${ONAP_REPO}onap/sdnc-image:${SDNC_IMAGE_TAG:-latest}
     depends_on :
       - db
     container_name: sdnc_controller

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 26b22ca..37eda3b 100755 (executable)
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -57,11 +57,15 @@ RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckey
 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
-RUN echo org.osgi.service.http.secure.port=$SDNC_SECUREPORT >> $ODL_HOME/etc/custom.properties
-RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties
-RUN echo org.ops4j.pax.web.ssl.password=\"$SDNC_KEYPASS\" >> $ODL_HOME/etc/custom.properties
-RUN echo org.ops4j.pax.web.ssl.keypassword=\"$SDNC_KEYPASS\" >> $ODL_HOME/etc/custom.properties
+RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+RUN echo org.osgi.service.http.port.secure=$SDNC_SECUREPORT >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+RUN echo org.ops4j.pax.web.ssl.keystore.type=PKCS12 >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+RUN echo org.ops4j.pax.web.ssl.keystore.password="$SDNC_KEYPASS" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+RUN echo org.ops4j.pax.web.ssl.password="$SDNC_KEYPASS" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+RUN echo org.ops4j.pax.web.ssl.key.password="$SDNC_KEYPASS" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+RUN echo org.ops4j.pax.web.ssl.keypassword="$SDNC_KEYPASS" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
+RUN echo org.ops4j.pax.web.ssl.key.alias=sdnc@sdnc.onap.org >> $ODL_HOME/etc/org.ops4j.pax.web.cfg
 
 # Overwrite svclogic compiler properties
 RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties