From d0afc09667a46c21dc5131a0b285160557c9433e Mon Sep 17 00:00:00 2001 From: Rich Tabedzki Date: Wed, 2 May 2018 15:24:06 -0400 Subject: Install AAF certificates in SDNC Changes made: * imported root certificate * Imported certificates from truststoreONAPall to Java truststore Change-Id: I66fdd1b9ebca9c3b3f72ab33ff989a08e996cca0 Issue-ID: SDNC-297 Signed-off-by: Rich Tabedzki Former-commit-id: 8868ab5881ad0fc6f4ff8411986e1c8a6c28ee4a --- admportal/pom.xml | 4 +-- dgbuilder/pom.xml | 4 +-- installation/admportal/pom.xml | 4 +-- installation/ansible-server/pom.xml | 4 +-- .../src/main/scripts/startAnsibleServer.sh | 6 ++-- installation/dgbuilder/pom.xml | 4 +-- installation/dmaap-listener/pom.xml | 4 +-- installation/pom.xml | 4 +-- installation/sdnc/pom.xml | 8 ++++-- installation/sdnc/src/main/docker/Dockerfile | 6 ++++ .../sdnc/src/main/resources/AAF_RootCA.cer | 31 +++++++++++++++++++++ .../sdnc/src/main/resources/truststoreONAPall.jks | Bin 0 -> 117990 bytes installation/ueb-listener/pom.xml | 4 +-- platform-logic/generic-resource-api/pom.xml | 4 +-- platform-logic/installer/pom.xml | 4 +-- platform-logic/lcm/pom.xml | 4 +-- platform-logic/pom.xml | 4 +-- platform-logic/restapi-templates/pom.xml | 4 +-- platform-logic/setup/pom.xml | 4 +-- platform-logic/vnfapi/pom.xml | 4 +-- pom.xml | 4 +-- version.properties | 2 +- 22 files changed, 78 insertions(+), 39 deletions(-) mode change 100644 => 100755 installation/sdnc/src/main/docker/Dockerfile create mode 100755 installation/sdnc/src/main/resources/AAF_RootCA.cer create mode 100755 installation/sdnc/src/main/resources/truststoreONAPall.jks diff --git a/admportal/pom.xml b/admportal/pom.xml index aa0d5287..794b1304 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent binding-parent - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam admportal - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: admportal diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 2bd3a5b2..b436c9cc 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam dgbuilder - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: dgbuilder diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 45059e5f..3f603c50 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-admportal - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates admportal Docker container diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 6078a2c4..235bace5 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ansible-server - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ansible-server Docker container diff --git a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh index eec62ba6..f1e93168 100644 --- a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh +++ b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh @@ -1,5 +1,5 @@ -#/bin/bash -exec &> /var/log/ansible-server.log +#!/bin/bash +exec &> >(tee -a "/var/log/ansible-server.log") if [ ! -f /tmp/.ansible-server-installed ] then @@ -14,4 +14,4 @@ then fi cd /opt/onap/sdnc -exec python RestServer.py \ No newline at end of file +exec /usr/bin/python RestServer.py diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index fc19d352..79737212 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-dgbuilder - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates docker container for dgbuilder diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 2e2ec923..bcef3114 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-dmaap-listener - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates dmaap-listener Docker container diff --git a/installation/pom.xml b/installation/pom.xml index a99675fe..579e2a02 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT sdnc-oam :: installation Installs SDN-C on local file system diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 330ac8c4..bc2494c2 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-sdnc - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container @@ -20,7 +20,7 @@ onap/sdnc-image ${project.version} - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -193,6 +193,8 @@ src/main/resources idmlight.db.mv.db + AAF_RootCA.cer + truststoreONAPall.jks false diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile old mode 100644 new mode 100755 index 3b92e406..f91ac84c --- 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 new file mode 100755 index 00000000..ff844b10 Binary files /dev/null and b/installation/sdnc/src/main/resources/truststoreONAPall.jks differ diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index f9bf898d..9d775a97 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ueb-listener - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ueb-listener Docker container diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index 862f83e6..ded97c31 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam platform-logic-generic-resource-api - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index adba71e4..5b2785e0 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam platform-logic-installer - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index 58b958f9..6bf9dd2b 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam platform-logic-lcm - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 1bb16be2..a8f42911 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam platform-logic - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 07f7b5db..febe270e 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam platform-logic-restapi-templates - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 33fde7db..3b3f13e1 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam platform-logic-setup - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index c094f094..1e0250f0 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam platform-logic-vnfapi - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index c49afae2..2d95f344 100755 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.onap.sdnc.oam sdnc-oam - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom sdnc-oam diff --git a/version.properties b/version.properties index 9614fbff..5b9fd15e 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=3 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg