diff options
author | 2019-09-19 13:03:25 +0000 | |
---|---|---|
committer | 2019-09-19 13:03:25 +0000 | |
commit | e5a5cc2831042b07d26e177365e8ee631dd530a8 (patch) | |
tree | a33754d282918a16215c795c6d493e52248cce72 | |
parent | 1d59a654cad940021d69fa916f9d22c43b2a9ab1 (diff) | |
parent | b7d9f29cd7cea5afea03525344052221f6454a02 (diff) |
Merge "update dfc using common certifiates"
-rw-r--r-- | plans/usecases/5G-bulkpm/assets/application.yaml | 26 | ||||
-rw-r--r-- | plans/usecases/5G-bulkpm/assets/datafile_endpoints.json | 16 | ||||
-rw-r--r-- | plans/usecases/5G-bulkpm/setup.sh | 7 |
3 files changed, 40 insertions, 9 deletions
diff --git a/plans/usecases/5G-bulkpm/assets/application.yaml b/plans/usecases/5G-bulkpm/assets/application.yaml new file mode 100644 index 00000000..086babc4 --- /dev/null +++ b/plans/usecases/5G-bulkpm/assets/application.yaml @@ -0,0 +1,26 @@ +spring: + profiles: + active: prod +management: + endpoints: + web: + exposure: + include: "loggers,logfile,health,info,metrics" +server: + port: 8433 + ssl: + key-store-type: PKCS12 + key-store-password: ericssondfc + key-store: classpath:keystore.jks + key-password: ericssondfc + keyAlias: tomcat-localhost +logging: + level: + ROOT: ERROR + org.springframework: ERROR + org.springframework.data: ERROR + org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR + org.onap.dcaegen2.collectors.datafile: TRACE + file: /var/log/ONAP/application.log +app: + filepath: /opt/app/datafile/config/datafile_endpoints.json diff --git a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json index 6ba0f257..cbb7cd53 100644 --- a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json +++ b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json @@ -1,14 +1,14 @@ { "config": { "//description": "This file is only used for testing purposes", - "dmaap.ftpesConfig.keyCert": "/config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", + "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", + "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass", "dmaap.security.enableDmaapCertAuth": "false", "streams_publishes": { "PM_MEAS_FILES": { diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 31ac2272..c2feb52d 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -149,8 +149,13 @@ docker cp dfc:/opt/app/datafile/config/datafile_endpoints.json /tmp/datafile_end echo data_endpoints.json from DFC containter cat /tmp/datafile_endpoints.json.fromcontainer docker cp /tmp/datafile_endpoints.json dfc:/opt/app/datafile/config/ +docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks.b64 dfc:/opt/app/datafile/etc/cert/ +docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass dfc:/opt/app/datafile/etc/cert/ +docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks.b64 dfc:/opt/app/datafile/etc/cert/ +docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass dfc:/opt/app/datafile/etc/cert/ +docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/application.yaml dfc:/opt/app/datafile/config/ #Increase Logging -docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml" +#docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml" docker restart dfc sleep 2 |