Enable https support in ODL container

Enable https support in ODL container

Change-Id: I33d1ab8924923f7ecd770b5cc8c215e133e81a71
Issue-ID: SDNC-492
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: 3eb089bd3bd87eac570495ac724573b1c1fa0773

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 5adac80..4f0d78a 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -23,6 +23,9 @@
                <sdnc.project.version>${project.version}</sdnc.project.version>
                <sdnc.northbound.version>1.4.2-SNAPSHOT</sdnc.northbound.version>
                <ccsdk.docker.version>0.3-STAGING-latest</ccsdk.docker.version>
+               <sdnc.keystore>keystore.sdnc.p12</sdnc.keystore>
+               <sdnc.keypass>onap3.0</sdnc.keypass>
+               <sdnc.secureport>8443</sdnc.secureport>
                <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
                <docker.push.phase>deploy</docker.push.phase>
                <docker.verbose>true</docker.verbose>

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 89e2aa0..73c8b25 100755 (executable)
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -10,7 +10,9 @@ ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
 ENV SSL_CERTS_DIR /etc/ssl/certs
 ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
 ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
-
+ENV SDNC_KEYSTORE ${sdnc.keystore}
+ENV SDNC_KEYPASS ${sdnc.keypass}
+ENV SDNC_SECUREPORT ${sdnc.secureport}
 
 
 # imstall ssl and java certificates
@@ -37,6 +39,13 @@ RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.kara
 RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg.1
 RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.1 | sed -e "\|featuresBoot=config|s|$|,sdnc-northbound-all|" > $ODL_HOME/etc/org.apache.karaf.features.cfg
 
+# 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
+
 
 # ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
 EXPOSE 8181

diff --git a/installation/src/main/stores/keystore.sdnc.p12 b/installation/src/main/stores/keystore.sdnc.p12
new file mode 100644 (file)
index 0000000..8fb4e2c
Binary files /dev/null and b/installation/src/main/stores/keystore.sdnc.p12 differ