From 52a9e3fd6c17ae3c0faa4d190894e148fcb61598 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 20 Feb 2019 20:13:42 +0000 Subject: [PATCH] add aafshiro feature config files and and update configuration files to support AAF Change-Id: I2362383091d78981c293fb536a1735e1352ebdc6 Issue-ID: SDNC-485 Signed-off-by: Ubuntu Former-commit-id: 3b73876ac29a3fd3391fdcff43236014e518501e --- installation/sdnc/pom.xml | 136 ++++++--- installation/sdnc/src/main/docker/Dockerfile | 20 +- .../sdnc/src/main/docker/standalone.Dockerfile | 42 +++ .../sdnc/src/main/resources/AAF_RootCA.cer | 31 -- .../sdnc/src/main/resources/aaa-app-config.xml | 320 +++++++++++++++++++++ installation/src/main/properties/bath_config.csv | 1 + .../src/main/properties/org.onap.sdnc.cred.props | 16 ++ .../src/main/properties/org.onap.sdnc.props | 15 + installation/src/main/stores/org.onap.sdnc.keyfile | 27 ++ installation/src/main/stores/org.onap.sdnc.p12 | Bin 0 -> 4263 bytes .../src/main/stores/org.onap.sdnc.trust.jks | Bin 0 -> 1413 bytes installation/src/main/yaml/docker-compose.yml | 2 + 12 files changed, 533 insertions(+), 77 deletions(-) create mode 100755 installation/sdnc/src/main/docker/standalone.Dockerfile delete mode 100755 installation/sdnc/src/main/resources/AAF_RootCA.cer create mode 100644 installation/sdnc/src/main/resources/aaa-app-config.xml create mode 100644 installation/src/main/properties/bath_config.csv create mode 100644 installation/src/main/properties/org.onap.sdnc.cred.props create mode 100644 installation/src/main/properties/org.onap.sdnc.props create mode 100644 installation/src/main/stores/org.onap.sdnc.keyfile create mode 100644 installation/src/main/stores/org.onap.sdnc.p12 create mode 100644 installation/src/main/stores/org.onap.sdnc.trust.jks diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index c26b4361..0a748e3e 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -17,7 +17,8 @@ Creates SDN Controller Docker container - onap/sdnc-image + onap/sdnc-aaf-image + onap/sdnc-image ${project.version} ${maven.build.timestamp} 1.5.1-SNAPSHOT @@ -84,23 +85,6 @@ docker-maven-plugin 0.28.0 false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - Dockerfile - - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - - - - - generate-images @@ -108,21 +92,100 @@ build + + + + ${image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + - - push-images - ${docker.push.phase} - - build - push - - + push-images + ${docker.push.phase} + + build + push + + + + + ${image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + + + + generate-standalone-images + package + + build + + + + + ${standalone.image.name} + + try + ${basedir}/target/docker-stage + standalone.Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + + + + push-standalone-images + ${docker.push.phase} + + build + push + + + + + ${standalone.image.name} + + try + ${basedir}/target/docker-stage + standalone.Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + + - - - maven-resources-plugin 2.6 @@ -140,6 +203,7 @@ src/main/docker Dockerfile + standalone.Dockerfile true @@ -157,8 +221,8 @@ src/main/scripts - - *.py + + *.py *.sh false @@ -179,8 +243,8 @@ src/main/resources idmlight.db.mv.db - AAF_RootCA.cer truststoreONAPall.jks + aaa-app-config.xml false @@ -219,6 +283,8 @@ ../src/main/properties *.properties + *.props + *.csv false @@ -238,6 +304,8 @@ ../src/main/stores *.jks + *.keyfile + *.p12 false @@ -287,7 +355,6 @@ org.codehaus.mojo 1.5.0 - change shell permissions process-sources @@ -310,10 +377,7 @@ - - - ONAP diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index d8ab5c39..315d023a 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -12,18 +12,8 @@ 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 - USER root - -# imstall ssl and java certificates -COPY AAF_RootCA.cer $SSL_CERTS_DIR -COPY truststoreONAPall.jks $JAVA_SECURITY_DIR -COPY AAF_RootCA.cer $SDNC_STORE_DIR -COPY truststoreONAPall.jks $SDNC_STORE_DIR - -RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit - # copy onap COPY opt /opt RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc @@ -39,6 +29,16 @@ RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/ RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg +# install AAF configs +COPY aaa-app-config.xml $ODL_HOME/etc/opendaylight/datastore/initial/config/ +RUN echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties + +# install ssl and java certificates +COPY truststoreONAPall.jks $JAVA_SECURITY_DIR +COPY truststoreONAPall.jks $SDNC_STORE_DIR + +RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit + RUN chown -R odl /opt USER odl diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile new file mode 100755 index 00000000..f271ca01 --- /dev/null +++ b/installation/sdnc/src/main/docker/standalone.Dockerfile @@ -0,0 +1,42 @@ +# Base ubuntu with added packages needed for open ecomp +FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} + +MAINTAINER SDN-C Team (sdnc@lists.onap.org) + +#ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk +ENV ODL_HOME /opt/opendaylight +ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties +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 + +USER root + +# copy onap +COPY opt /opt +RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc +RUN mkdir /opt/opendaylight/current/certs + +# copy SDNC mvn artifacts to ODL repository +COPY system /tmp/system +RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system + +# Add SDNC repositories to boot repositories +RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig +RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-connector-all,odl-netconf-clustered-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg + +# install ssl and java certificates +COPY truststoreONAPall.jks $JAVA_SECURITY_DIR +COPY truststoreONAPall.jks $SDNC_STORE_DIR + +RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit + +RUN chown -R odl /opt +USER odl + +ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh +EXPOSE 8181 diff --git a/installation/sdnc/src/main/resources/AAF_RootCA.cer b/installation/sdnc/src/main/resources/AAF_RootCA.cer deleted file mode 100755 index e9a50d7e..00000000 --- a/installation/sdnc/src/main/resources/AAF_RootCA.cer +++ /dev/null @@ -1,31 +0,0 @@ ------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/aaa-app-config.xml b/installation/sdnc/src/main/resources/aaa-app-config.xml new file mode 100644 index 00000000..86e66674 --- /dev/null +++ b/installation/sdnc/src/main/resources/aaa-app-config.xml @@ -0,0 +1,320 @@ + + + + + + + + + + + + + + + + + + + + + +
+ tokenAuthRealm + org.onap.aaf.cadi.shiro.AAFRealm + +
+ + + + + + + + + + + +
+ securityManager.realms + $tokenAuthRealm +
+ +
+ authcBasic + org.opendaylight.aaa.shiro.filters.ODLHttpAuthenticationFilter +
+ + + + +
+ accountingListener + org.opendaylight.aaa.shiro.filters.AuthenticationListener +
+
+ securityManager.authenticator.authenticationListeners + $accountingListener +
+ + +
+ dynamicAuthorization + org.opendaylight.aaa.shiro.realm.MDSALDynamicAuthorizationFilter +
+ + + + + + + /** + + authcBasic, rest[org.onap.sdnc.odl:odl-api] + + + diff --git a/installation/src/main/properties/bath_config.csv b/installation/src/main/properties/bath_config.csv new file mode 100644 index 00000000..b6db7784 --- /dev/null +++ b/installation/src/main/properties/bath_config.csv @@ -0,0 +1 @@ +Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==,Basic c2RuY0BzZG5jLm9uYXAub3JnOmRlbW8xMjM0NTYh,2050-03-03 diff --git a/installation/src/main/properties/org.onap.sdnc.cred.props b/installation/src/main/properties/org.onap.sdnc.cred.props new file mode 100644 index 00000000..bf17c8fa --- /dev/null +++ b/installation/src/main/properties/org.onap.sdnc.cred.props @@ -0,0 +1,16 @@ +############################################################ +# Properties Generated by AT&T Certificate Manager +# by root +# on 2019-02-15T20:08:10.860+0000 +# @copyright 2016, AT&T +############################################################ +Challenge=enc:oGjvjifDJqw2I9ipISWLXcNZSimLv-lxGBbQV0MXl8yTlDok71cU9bZZPSXhY6Uo +cadi_alias=sdnc@sdnc.onap.org +cadi_key_password=enc:tz_2Pq5zN4PnVC0pUsWUBnzDtqBaZXkdgZB-DlU3gS4PFSjKifMnJxGg5rFZzZNe +cadi_keyfile=/opt/sdnc/data/stores/org.onap.sdnc.keyfile +cadi_keystore=/opt/sdnc/data/stores/org.onap.sdnc.p12 +cadi_keystore_password=enc:JetlhxTZNNDxsOvg-ZpBuRBJBFP8LN1UkFkkjT4aiEZExnglL717p-YVl2Lf3wMq +cadi_keystore_password_p12=enc:JetlhxTZNNDxsOvg-ZpBuRBJBFP8LN1UkFkkjT4aiEZExnglL717p-YVl2Lf3wMq +cadi_truststore=/opt/sdnc/data/stores/org.onap.sdnc.trust.jks +cadi_truststore_password=enc:QrEzLSaLryxoB2Z2UXJEbRWxZRAhs2i4BAvKIcNYgbDPZY4gnpJWUhEbIwqnbGEn +cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US:CN=ATT AAF CADI Issuing CA 01, OU=CSO, O=ATT, C=US:CN=ATT AAF CADI Issuing CA 02, OU=CSO, O=ATT, C=US diff --git a/installation/src/main/properties/org.onap.sdnc.props b/installation/src/main/properties/org.onap.sdnc.props new file mode 100644 index 00000000..5b96b907 --- /dev/null +++ b/installation/src/main/properties/org.onap.sdnc.props @@ -0,0 +1,15 @@ +############################################################ +# Properties Generated by AT&T Certificate Manager +# by root +# on 2019-02-15T20:08:07.125+0000 +# @copyright 2016, AT&T +############################################################ +aaf_id=sdnc@sdnc.onap.org +aaf_locate_url=https://aaf-onap-test.osaaf.org:8095 +aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1 +cadi_etc_dir=/opt/sdnc/data/stores +cadi_latitude=38.432899 +cadi_longitude=-90.43248 +cadi_prop_files=/opt/sdnc/data/properties/org.onap.sdnc.cred.props +cm_url=https://AAF_LOCATE_URL/AAF_NS.cm:2.1 +cadi_bath_convert=/opt/sdnc/data/properties/bath_config.csv diff --git a/installation/src/main/stores/org.onap.sdnc.keyfile b/installation/src/main/stores/org.onap.sdnc.keyfile new file mode 100644 index 00000000..2aa22f05 --- /dev/null +++ b/installation/src/main/stores/org.onap.sdnc.keyfile @@ -0,0 +1,27 @@ +__xWcKUL9kIQ-CVozfIv2AEmpntzCP8U9jWKxgnMJFHHlp2yPPpyPxYzigQX54HU9rtM4mfB5nob +TzJw7zNzgmOlBbysPQNNoZwekF2vCR3YAtU_9cAzd9_rp8AS_XhaILCxCk3btgVWp-deoAMdvkdS +3VYd7DQvSqZbuKOdTsQDJo1xrCEs3nblVoeBPglYrsBcgqEA-m7caibASeDmm8S2AXpelZXCRSQU +u4xNFGp02GFiezSQTDoH7LWjbwI3j3nuJbSjjtQbNGPZKii6CrYDwrA9MSXXiR4XBWJR4aNj52KH +QlYZdezYZTjsGuReqnov3SqjPmPhzyYqxmmRGQFrOO_U1ITqeVgnrZdL6mSSljqoqw5GzSrHRk8A +EL26hEM9pExJdGvJOj9q9z7wjpfz4bJ4xddEnwccbK0mHDv2aW1oTCRZXe7tlhFujstFY5ONaZIi +IINmYSW8-yy_pq62rndmG-wv4HsiuBocxUZhJPOlPewCar3Jm4Nr4RTyEBXPWIm3bgbzPnOYQuKw +22K_XkTdbEHWK4_jVV8k_kvxb1Gnf9eelcZOVE5sc7Qm1ulW5E5x21AeM277QtYHubyCQpaLZ-dS +2ZJHHdS6m11rc-kI_rAs6lq-ZgzR_AfbqTdgTRbt5ydjCPSR5Z7akIYjiNLXhH2rqPAczsPZ19D7 +obI6gd67db0S1GJuCni7AAFWaEmyhwjjqF-UoUGXaBMJG5DDlq14-fkCGvSPI_A8Bs9IrRaIF7Un +6WDQklz0keTp3g9FL8DWT2YMus35Gy2-5xckotOOSuANT0rLrtH4VDDufB-5IukTbe3g3KALNl96 +DLIthbH_5wsje0LHi5a4DBfYZCJuqL5-dtpcjaozywNbDUPkoGGA3gHsj5ymB0uP1xWGg2HL5L8B +XIVS1JziY9wJH2eOdTAemoh2QAiJ07HksKIrI0BshmFi3yqMG3WNDaLPT9lqdGIeu4cSGjG9gFk1 +1IdfP0lhIVuNDqXkDdyQ1isw_pDJPTWAh86kS6e5iWu2Nz12vv1Yz0r0D8KAtMFiqtQOWCyDIT9l +n64p_-1swaeOASoK3xXf4s53EOOOD91iwUf3t2PkAQwPGHrEYcc1pCT6xy0mSOx3pSN10ez0_-Y8 +ANYRCarVOp0IWdIf4ZmIMK76ITbu4iRMKVtYNJH1J8IPsYI75cULyzL1G9q1DFWGWpB25KCPAird +kJmUoT_pI82tFJt7tCTACsdQ5_5uEoACF9crth2MBE0D_fRb6PhEZrZqW4JpRRSDpZHOEredQY5k +QV119KaN5GtuKwb45wzxyGR6c6MvIGYQ3-0ni1xGde84lUI8gEtIOhzLE8W54m52BE27UC78G3oq +WUwIaHxxMDfGKxxRJNgovIyXuyLXPOZaU_hivgNxniLy_PrSihUZ6vM7Mku18_p8pAQtjKryWbpg +39SY2GeTodUNYznRB94n2ob4yDt85H_zDvyDpcLj91W5vMMaQb8skoA-x_pTxJvrcx-Iq9U-XaNl +nf4BonnggI9E0YL3GH_-pg-bVlO7rzZ9EGQI1omhRBrinawMKdoVIXD9L4y8pULgZZNSQuI6AAKu +jwwT3ALe_PUJaPNZNR4ldiAfURAqQtVLUrHMX1O3cptkju3lMiURJO7-Xrr6jwR078IiS5RNKACB +EAvX8zVON3Ggt101NgFKgdYEy5JaoUvazndLGnoqos3LEMVNm6Ukx1U56AP27Yq-xaqdpnICupiz +M6LCCAgdksyn84IFexB2y_oxsBppvTNwqGsMQvVTiVkKXGWHcunzVr8eQdwrGWFoU_Qi6XG9V2mO +i5kIulkzEgjaBsG2VErF8DfTWXUcv2HYk9kRAQQ8ABRbiRwHdVjwPvXIlTLgrKxF_LhmFIBhrI1W +5BHEKF9FQb6DGI-vNrqFSaVjDSGAT-r5SBZFPkkiO7yg5E4L9LnB4zGc4IbwDAjYuzXooo73FuHs +EdLz0GTc_4DUDXe0T-OnUzq4mZevZ9KxvgvVSRcPIwvYh26p3IPyeurK_OwDI6KevAo2Lady \ No newline at end of file diff --git a/installation/src/main/stores/org.onap.sdnc.p12 b/installation/src/main/stores/org.onap.sdnc.p12 new file mode 100644 index 0000000000000000000000000000000000000000..d3e4d9d22ba0a9fb2f5157cdb1e0ff00a214b2d2 GIT binary patch literal 4263 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 literal 0 HcmV?d00001 diff --git a/installation/src/main/stores/org.onap.sdnc.trust.jks b/installation/src/main/stores/org.onap.sdnc.trust.jks new file mode 100644 index 0000000000000000000000000000000000000000..fdb8cdf70ba47ccf63e9d40fa94d542fd96b121d GIT binary patch literal 1413 zcmb7DSyYk<7-iMmAfu36Qgaz{w0Nh(2B>UuWmTBV2^&|O3ZS$}6;Ke0JFrVb z4Mzm_0|eZD9KoFErJ;r=0(d;`U;00COb=Bb_i!4DH}slf5Ps6_CU+|^%ffo5zP;I_-Czb&+L{g# z`3?tMAfLq!Hs-Y7dOGW$Dm5V&_-C1VN|OILbYPBa(1vvKY39Uhq^G*naItd-xE<_q zCFEgxLRhKaTITyySX-c8@>p3`K{Vm0?^4fzs&*CjY=;ot)9IFUCwAQfJ28_UveNX} z_U4HMkBWAFRPrrh#yZlUKlRFWly_UN;)!+Jpu?I`%+*C^W~7Y)?T%HpXj_#F<$#u% z(;9D3aMx&w{QIgZ+f&GHjMSa-YaqmZFI9IF+deoLR5w;JN`37D4R9JE5NA79UN4n1 z^FC|3ih>j*6Of$kN#h@f`-b~+2)x)S6!kNrK!UH1Rmn$C4QXm!)h1Q7A+PEkhKN3} zc65I-DGW_hty24ymt~E)$gmn)G^Ton7ETnWv^Us!X#nEP($#}JlRif$#kDhm;_xUs zMatjTJ)LDwDH@2iI#+k|VVS|`1yexe!++MFc=X$JQlWGF-Q}YQe^dW8*a@-2jiQD>Uq>~ou@g-L2?T~li{Zr}?C>R7TI}gwRos9_UAYf?Nc6SPX z#c@vJ#uG-|6Jl}Ei|^-u0dzOl1~3eOj{9!|a?^kUgV$kj0J;GHVpBkF3b2iWuz!r< zMk_XA2nLaKd+9Y1Mb5P(%|M!EhuO*A9>q&?yIR6zLa+gTpLjKQ1ezPJaAi$hnS{vD zDvoD3_V|i2G^t6Kb9tF8@?P)k&V@C(v3{#wFui?&RN#8`*@*edwGTC2CG!IuM^Qk| z$45X~UgY2o;$d%{Z;UIag~kHT_w45nV8x-=CwE?tNX{>KXiF>m>d-$}EAX+cEGhIx zWeyls$Gx)_b(u@+La(ywTbqb_Pj5?84Oy>UQ`AWj#YN>S;ujIovzL2QG1V`*Nt|&0 zlU-4X#uSH|=61*9gCY9h<=zInksO3HJn<8uMH5!VFdZ&+qtlQ1|hJeYPw;GUjl!OrgFBFjzWaSWD?hw;zLgR-zR?sjZ&66@@h#dAze zX|nG6gNjNt{;3Lf6+00u$tYhBVpwSM((x%;{ozfPSiQeW^NyqV_z^4TH3;^65jz&Y^2|P2!kIfU0n&L`vUJ0*aTY^oY7dVdqAqf* zL-RhJij_=XdtBk{V<<`7-Fi=k%9(@D(4!twxEobrh%Zu6?VeH*TN31Z* T4lT0h4tp5+D_iitamW4!okd~E literal 0 HcmV?d00001 diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 38522518..12ca37bb 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -66,6 +66,8 @@ services: options: max-size: "30m" max-file: "5" + extra_hosts: + aaf.osaaf.org: 10.12.6.214 web: -- 2.16.6