VOL-629: Change name of consul service to 'vconsul'.
This avoids conflicts with other services named consul in some environments
Change-Id: If42119a57d01cf441df8e1ca92c1043923f59c03
diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 2582fb9..52e3cf7 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -23,13 +23,13 @@
KAFKA_HEAP_OPTS: "-Xmx256M -Xms128M"
SERVICE_9092_NAME: "kafka"
depends_on:
- - consul
+ - vconsul
volumes:
- /var/run/docker.sock:/var/run/docker.sock
#
# Single-node consul agent
#
- consul:
+ vconsul:
image: "${REGISTRY}consul:0.9.2"
command: agent -server -bootstrap -client 0.0.0.0 -ui
ports:
@@ -52,10 +52,10 @@
"-retry-attempts", "100",
"-cleanup",
# "-internal",
- "consul://consul:8500"
+ "consul://vconsul:8500"
]
links:
- - consul
+ - vconsul
volumes:
- "/var/run/docker.sock:/tmp/docker.sock"
@@ -104,7 +104,7 @@
"--host=${DOCKER_HOST_IP}"
]
depends_on:
- - consul
+ - vconsul
- kafka
- grafana
restart: unless-stopped
@@ -133,9 +133,9 @@
- 18880
- "60001:60001"
depends_on:
- - consul
+ - vconsul
links:
- - consul
+ - vconsul
- fluentd
environment:
SERVICE_8880_NAME: "voltha-health"
@@ -158,6 +158,10 @@
- "/envoy/voltha-grpc-proxy.template.json"
- -envoy-config
- "/envoy/voltha-grpc-proxy.json"
+ - -consul-svc-nme
+ - "vconsul"
+ - -kv-svc-name
+ - "vconsul"
ports:
- "50555:50555"
- "8882:8882"
@@ -180,6 +184,7 @@
command: [
"/cli/cli/setup.sh",
"-L",
+ "-C vconsul:8500",
"-G"
]
environment:
@@ -212,10 +217,10 @@
"-v"
]
depends_on:
- - consul
+ - vconsul
- voltha
links:
- - consul
+ - vconsul
- fluentd
volumes:
- "/var/run/docker.sock:/tmp/docker.sock"
@@ -239,10 +244,10 @@
ports:
- "830:1830"
depends_on:
- - consul
+ - vconsul
- voltha
links:
- - consul
+ - vconsul
- fluentd
environment:
SERVICE_1830_NAME: "netconf-server"
@@ -263,7 +268,7 @@
"--docker_host=${DOCKER_HOST_IP}"
]
depends_on:
- - consul
+ - vconsul
- kafka
- grafana
restart: unless-stopped
@@ -281,7 +286,7 @@
"/nginx_config/start_service.sh"
]
depends_on:
- - consul
+ - vconsul
- grafana
- portainer
restart: unless-stopped