Multiple Fixes in Registrator to Consul Communication.
- TLS works with Certificate Verififcation on both sides.
- registrator changed from latest to master , docker pull gliderlabs/registrator:master
- A source code fix is needed in Registrator to make TLS work.
Change-Id: Ib23e0c790b9edd303d2292e87b4ea8149aa0311f
diff --git a/compose/docker-compose-system-test-encrypted.yml b/compose/docker-compose-system-test-encrypted.yml
index 4b8a7c5..d6c4c25 100644
--- a/compose/docker-compose-system-test-encrypted.yml
+++ b/compose/docker-compose-system-test-encrypted.yml
@@ -31,7 +31,7 @@
#
consul:
image: voltha/consul
- command: agent -server -bootstrap -client 0.0.0.0 -ui
+ command: agent -server -bootstrap -client 0.0.0.0 -ui
ports:
- "8300:8300"
- "8400:8400"
@@ -51,7 +51,7 @@
"-ip=${DOCKER_HOST_IP}",
"-retry-attempts", "100",
# "-internal",
- "consul://consul-tls:8501"
+ "consul-tls://consul:8501"
]
links:
- consul
@@ -59,8 +59,8 @@
- "/var/run/docker.sock:/tmp/docker.sock"
environment:
CONSUL_CACERT: "/reg/config/voltha-CA-template.pem"
- CONSUL_TLSCERT: "/reg/config/voltha-cert-template.crt"
- CONSUL_TLSKEY: "/reg/config/voltha-pvt-template.key"
+ CONSUL_CLIENT_CERT: "/reg/config/voltha-cert-template.crt"
+ CONSUL_CLIENT_KEY: "/reg/config/voltha-pvt-template.key"
#
# Fluentd log server
@@ -285,7 +285,7 @@
- portainer
restart: unless-stopped
volumes:
- - "/cord/incubator/voltha/nginx_config:/nginx_config"
+ - "/home/cord/cord/incubator/voltha/nginx_config:/nginx_config"
#
# Docker ui