diff options
Diffstat (limited to 'sanitycheck/pnfsimulator-secured')
4 files changed, 8 insertions, 8 deletions
diff --git a/sanitycheck/pnfsimulator-secured/certman/docker-compose.yml b/sanitycheck/pnfsimulator-secured/certman/docker-compose.yml index 5b40a09..e233716 100644 --- a/sanitycheck/pnfsimulator-secured/certman/docker-compose.yml +++ b/sanitycheck/pnfsimulator-secured/certman/docker-compose.yml @@ -53,8 +53,6 @@ services: - "5000:5000" command: bash -c " while [[ $$(ls -1 /app/store | wc -l) != '10' ]]; do echo 'Waiting for certs...'; sleep 3; done - && export CLIENT_CERT_PASS=$$(cat /app/store/p12.pass) - && export TRUST_CERT_PASS=$$(cat /app/store/trust.pass) && java -Dspring.config.location=file:/app/application.properties -cp /app/libs/*:/app/pnf-simulator.jar org.onap.pnfsimulator.Main " volumes: diff --git a/sanitycheck/pnfsimulator-secured/certservice/Makefile b/sanitycheck/pnfsimulator-secured/certservice/Makefile index aea8477..2d3754c 100644 --- a/sanitycheck/pnfsimulator-secured/certservice/Makefile +++ b/sanitycheck/pnfsimulator-secured/certservice/Makefile @@ -44,8 +44,10 @@ clean-all: --clean-pnfsim --clean-env --clean-pnfsim: docker-compose -f docker-compose-pnfsim.yml down - rm -rf ./resources/certservice-client/client-volume-for-pnfsim/cert.p12 || true rm -rf ./resources/certservice-client/client-volume-for-pnfsim/trust.jks || true + rm -rf ./resources/certservice-client/client-volume-for-pnfsim/cert.p12 || true + rm -rf ./resources/certservice-client/client-volume-for-pnfsim/p12.pass || true + rm -rf ./resources/certservice-client/client-volume-for-pnfsim/trust.pass || true --clean-env: docker-compose -f docker-compose-ves-dmaap.yml down diff --git a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml index f09b0a9..d5bb5e2 100644 --- a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml +++ b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml @@ -44,10 +44,10 @@ services: - public command: bash -c " while [[ $$(ls -1 /app/store | wc -l) != '4' ]]; do echo 'Waiting for certs...'; sleep 3; done - && cp /app/store/truststore.jks /app/store/trust.jks - && cp /app/store/keystore.jks /app/store/cert.p12 - && export CLIENT_CERT_PASS=$$(cat /app/store/keystore.pass) - && export TRUST_CERT_PASS=$$(cat /app/store/truststore.pass) + && cp /app/store/truststore.p12 /app/store/trust.jks + && cp /app/store/keystore.p12 /app/store/cert.p12 + && cp /app/store/keystore.pass /app/store/p12.pass + && cp /app/store/truststore.pass /app/store/trust.pass && java -Dspring.config.location=file:/app/application.properties -cp /app/libs/*:/app/pnf-simulator.jar org.onap.pnfsimulator.Main " volumes: diff --git a/sanitycheck/pnfsimulator-secured/certservice/resources/certservice-client/client-configuration-for-pnfsim.env b/sanitycheck/pnfsimulator-secured/certservice/resources/certservice-client/client-configuration-for-pnfsim.env index cda235d..c5f33b6 100644 --- a/sanitycheck/pnfsimulator-secured/certservice/resources/certservice-client/client-configuration-for-pnfsim.env +++ b/sanitycheck/pnfsimulator-secured/certservice/resources/certservice-client/client-configuration-for-pnfsim.env @@ -3,7 +3,7 @@ REQUEST_URL=https://oom-cert-service:8443/v1/certificate/ REQUEST_TIMEOUT=10000 OUTPUT_PATH=/var/certs CA_NAME=RA -OUTPUT_TYPE=JKS +OUTPUT_TYPE=P12 #Csr config envs COMMON_NAME=onap.org ORGANIZATION=Linux-Foundation |