diff options
author | Dan Timoney <dt5972@att.com> | 2018-05-03 15:36:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-05-03 15:36:52 +0000 |
commit | a1fe57d18e87da78da9ae0f442676d0a7c23bbf5 (patch) | |
tree | 2c709938682b4dfa67237835e324eda0e3c0e7cc | |
parent | 6efa82e5312bb0d63bd882e1b0f6d48f51b24cec (diff) | |
parent | d0afc09667a46c21dc5131a0b285160557c9433e (diff) |
Merge "Install AAF certificates in SDNC"
Former-commit-id: 6ddeb29d894c03facb4b29e81611da0be10ca6fd
-rw-r--r-- | installation/sdnc/pom.xml | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | installation/sdnc/src/main/docker/Dockerfile | 6 | ||||
-rwxr-xr-x | installation/sdnc/src/main/resources/AAF_RootCA.cer | 31 | ||||
-rwxr-xr-x | installation/sdnc/src/main/resources/truststoreONAPall.jks | bin | 0 -> 117990 bytes |
4 files changed, 39 insertions, 0 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index c7811619..bc2494c2 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -193,6 +193,8 @@ <directory>src/main/resources</directory> <includes> <include>idmlight.db.mv.db</include> + <include>AAF_RootCA.cer</include> + <include>truststoreONAPall.jks</include> </includes> <filtering>false</filtering> </resource> diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 3b92e406..f91ac84c 100644..100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -6,7 +6,13 @@ MAINTAINER SDN-C Team (sdnc@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV ODL_HOME /opt/opendaylight/current ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties +ENV SSL_CERTS_DIR /etc/ssl/certs +ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java +# imstall ssl and java certificates +COPY AAF_RootCA.cer $SSL_CERTS_DIR +COPY truststoreONAPall.jks $JAVA_SECURITY_DIR +RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit # Overlay ODL credential database with pre-staged credentials COPY idmlight.db.mv.db /opt/opendaylight/current/data diff --git a/installation/sdnc/src/main/resources/AAF_RootCA.cer b/installation/sdnc/src/main/resources/AAF_RootCA.cer new file mode 100755 index 00000000..e9a50d7e --- /dev/null +++ b/installation/sdnc/src/main/resources/AAF_RootCA.cer @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV +BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx +NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK +DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7 +XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn +H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM +pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7 +NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg +2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY +wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd +ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM +P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6 +aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY +PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G +A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ +UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN +BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz +L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9 +7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx +c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf +jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2 +RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h +PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF +CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+ +Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A +cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR +ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX +dYY= +-----END CERTIFICATE----- diff --git a/installation/sdnc/src/main/resources/truststoreONAPall.jks b/installation/sdnc/src/main/resources/truststoreONAPall.jks Binary files differnew file mode 100755 index 00000000..ff844b10 --- /dev/null +++ b/installation/sdnc/src/main/resources/truststoreONAPall.jks |