From 0fc9eab94f101a9713c951b3c159065c72a31495 Mon Sep 17 00:00:00 2001 From: grabinsk Date: Thu, 23 May 2019 13:34:38 +0200 Subject: Use single PRH container with ssl configuration Generating new certificates since the old ones have expired Change-Id: If68ceab0bea7dbc10db647af7530b39b44729c0c Issue-ID: INT-1076 Signed-off-by: grabinsk --- .../prh-testcases/resources/docker-compose.yml | 32 ++++------------------ 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'tests/dcaegen2/prh-testcases/resources/docker-compose.yml') diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index 7b208b8b..a8e5d566 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -5,23 +5,6 @@ services: ports: - "8100:8100" - "8433:8433" - environment: - - LOG_LEVEL - - PRH_LOG_LEVEL - container_name: prh - depends_on: - cbs: - condition: service_healthy - dmaap-mr: - condition: service_started - aai: - condition: service_started - - ssl_prh: - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest - ports: - - "8200:8100" - - "8533:8433" volumes: - ./simulator/certs:/tmp/certs environment: @@ -30,7 +13,7 @@ services: - HOSTNAME - CONSUL_HOST - CONFIG_BINDING_SERVICE - container_name: ssl_prh + container_name: prh depends_on: cbs: condition: service_healthy @@ -121,11 +104,11 @@ services: "Authorization": "Basic QUFJOkFBSQ==" }, - "security.trustStorePath":"change it", - "security.trustStorePasswordPath":"change it", - "security.keyStorePath":"change it", - "security.keyStorePasswordPath":"change it", - "security.enableAaiCertAuth":false, + "security.trustStorePath":"/tmp/certs/truststore.jks", + "security.trustStorePasswordPath":"/tmp/certs/truststore.password", + "security.keyStorePath":"/tmp/certs/keystore.p12", + "security.keyStorePasswordPath":"/tmp/certs/keystore.password", + "security.enableAaiCertAuth":true, "security.enableDmaapCertAuth":false, "streams_publishes":{ @@ -240,6 +223,3 @@ services: timeout: 2s retries: 20 container_name: cbs - - - -- cgit 1.2.3-korg