diff options
| author |   Dan Timoney <dtimoney@att.com> | 2018-10-31 14:04:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-31 14:04:39 +0000 |
| commit | b2ad2dd297a7bc2bf1a84cd452076a7edbd7d1e6 (patch) | |
| tree | 220a497278da373def5bf9a60e3ace2603a64162 | |
| parent | e1bfe747db965352edd19da0eba29b7969de9d75 (diff) | |
| parent | 0ba61e79bb6f745df8f6ed89517799ae076c489b (diff) | |
Merge "Enable https support in ODL container" into casablanca
Former-commit-id: 5ecaefd8c245ff4fd031d98ea81f53c05053e4d7
| -rw-r--r-- | installation/sdnc/pom.xml | 3 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 11 | ||||
| -rw-r--r-- | installation/src/main/stores/keystore.sdnc.p12 | bin | 0 -> 2605 bytes |
3 files changed, 13 insertions, 1 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 5adac80f..4f0d78a4 100644 --- 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 89e2aa01..73c8b257 100755 --- 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 Binary files differnew file mode 100644 index 00000000..8fb4e2cd --- /dev/null +++ b/installation/src/main/stores/keystore.sdnc.p12 |