From 744ed22cf73e9f1ecd3afa78b0485db3ed6cf11e Mon Sep 17 00:00:00 2001 From: rajendrajaiswal Date: Mon, 2 Mar 2020 14:53:27 +0000 Subject: [PATCH] Update certs for pmmapper in Bulkpm usecase Change-Id: Ida9c6fc6a43c0195b7435503c94053743f9714e9 Issue-ID: INT-832 Signed-off-by: Rajendra Jaiswal --- plans/usecases/5G-bulkpm/assets/config.json | 4 ++-- plans/usecases/5G-bulkpm/setup.sh | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plans/usecases/5G-bulkpm/assets/config.json b/plans/usecases/5G-bulkpm/assets/config.json index aacbb5b0..7d2d64ef 100644 --- a/plans/usecases/5G-bulkpm/assets/config.json +++ b/plans/usecases/5G-bulkpm/assets/config.json @@ -1,8 +1,8 @@ { "pm-mapper-filter": { "filters":[]}, - "key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64", + "key_store_path": "/opt/app/pm-mapper/etc/cert.jks", "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass", - "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64", + "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks", "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "1", diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index cc638be4..9fbd2ef9 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -142,10 +142,6 @@ 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" @@ -212,9 +208,9 @@ sed -i 's/3.3.3.3/'$PMMAPPER_IP'/g' docker-compose.yml docker-compose up -d # Setting up PM Mapper certs. -docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks.b64 pmmapper:opt/app/pm-mapper/etc/ +docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks pmmapper:opt/app/pm-mapper/etc/ docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass pmmapper:opt/app/pm-mapper/etc/ -docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks.b64 pmmapper:opt/app/pm-mapper/etc/ +docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks pmmapper:opt/app/pm-mapper/etc/ docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass pmmapper:opt/app/pm-mapper/etc/ docker restart pmmapper sleep 5 -- 2.16.6