diff options
| author |   Filip Krzywka <filip.krzywka@nokia.com> | 2019-03-20 10:42:19 +0100 |
|---|---|---|
| committer | Filip Krzywka <filip.krzywka@nokia.com> | 2019-03-21 14:07:49 +0100 |
| commit | d2da2cc4bd18fe33124dd105608443c10f981a2d (patch) | |
| tree | 141bc46ed11bda03b08b6b536d8321c06cb1e9a9 /plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml | |
| parent | 4a3c1a1b963427febece0ca6235595041a3b9a99 (diff) | |
Update HV-VES testsuites
This commit follows related changes made in DCAEGEN2-1340 and overall
DCAEGEN2-1151 story.
- use configuration files instead of command line parameters
- organize collector volumes for ease of use
- move environment variables to .env file for reuse
- removed redundant aliases in ves-hv-network
Change-Id: I782db9d0996308810834c322906ab861be183193
Issue-ID: DCAEGEN2-1340
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
Diffstat (limited to 'plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml')
| -rw-r--r-- | plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml index ac07eb78..32b39438 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml @@ -56,13 +56,14 @@ services: ports: - "10000:10000" environment: - CONSUL_HOST: "consul-server" + - CONSUL_HOST depends_on: - consul-server networks: ves-hv-default: aliases: - cbs + # # DCAE HV VES Collector # @@ -72,22 +73,19 @@ services: ports: - "6060:6060" - "6061:6061/tcp" - command: ["--listen-port", "6061", - "--kafka-bootstrap-servers", "kafka:9092", - "--key-store-password", "onaponap", - "--trust-store-password", "onaponap"] + command: ["--configuration-file", "/etc/hv-ves/configuration/secure.json"] environment: - JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid" - CONSUL_HOST: "consul-server" - CONFIG_BINDING_SERVICE: "cbs" - HOSTNAME: "dcae-hv-ves-collector" + - JAVA_OPTS + - HOSTNAME=${HV_VES_HOSTNAME} + - CONSUL_HOST + - CONFIG_BINDING_SERVICE healthcheck: interval: 10s timeout: 5s retries: 2 test: ${HV_VES_HEALTHCHECK_CMD} volumes: - - ./ssl/:/etc/ves-hv/ + - ./collector/:/etc/hv-ves/ depends_on: - config-binding-service - kafka @@ -99,21 +97,19 @@ services: ports: - "7060:6060" - "7061:6061/tcp" - command: ["--listen-port", "6061", - "--kafka-bootstrap-servers", "kafka:9092", - "--ssl-disable"] + command: ["--configuration-file", "/etc/hv-ves/configuration/insecure.json"] environment: - JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid" - CONSUL_HOST: "consul-server" - CONFIG_BINDING_SERVICE: "cbs" - HOSTNAME: "dcae-hv-ves-collector" + - JAVA_OPTS + - HOSTNAME=${HV_VES_HOSTNAME} + - CONSUL_HOST + - CONFIG_BINDING_SERVICE healthcheck: interval: 10s timeout: 5s retries: 2 test: ${HV_VES_HEALTHCHECK_CMD} volumes: - - ./ssl/:/etc/ves-hv/ + - ./collector/:/etc/hv-ves/ depends_on: - config-binding-service - kafka @@ -133,7 +129,5 @@ services: depends_on: - kafka networks: - ves-hv-default: - aliases: - - dcae-app-simulator + - ves-hv-default |