This rather large update adds the following
- A golang build container used for building golang executables and/or
containers.
- envoyd, a daemon process that creates and updates the envoy config
file based on consul's KV store and forces envoy to reload the config
as it changes.
- Dockerfile(s) and compose files that integrate envoy into the NBI call
chain to load-balance device-to-core assignment.
- Several developer tools that help build and replace specific
containers in a running cluster. This allows the build process to be
separated from the run-time as it will be in production.
- NOTES: A command line needs to be added to envoyd because now the
values are declared at the start of the file. This will be submitted
in a subsequent commit along with a change toward a more object
oriented implementation.
Addressed reviewer comments.
Addressed even more reviewr comments.
Change-Id: Ia2ec825d48d475398e501f396452fb0306673432
diff --git a/compose/docker-compose-envoy-swarm.yml b/compose/docker-compose-envoy-swarm.yml
index 95d6580..a109af9 100644
--- a/compose/docker-compose-envoy-swarm.yml
+++ b/compose/docker-compose-envoy-swarm.yml
@@ -1,5 +1,5 @@
#
-# This Docker stackfile deploys an envoy proxy container along with one backup.
+# This Docker stackfile deploys an envoy proxy container.
#
# The stackfile assumes that overlay network 'voltha_net' has already been
# created. To deploy the stack, issue the command:
@@ -9,19 +9,20 @@
version: "3"
services:
- envoy:
+ voltha:
image: voltha/envoy:latest
deploy:
replicas: 1
environment:
DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
entrypoint:
- - /usr/local/bin/envoy
- - -c /etc/envoy/front-proxy/voltha-grpc-proxy.json
+ - /usr/local/bin/envoyd
+ - -t /envoy/voltha-grpc-proxy.template.json
+ - -c /envoy/voltha-grpc-proxy.json
networks:
- voltha-net
ports:
- - "50556:50556"
+ - "50555:50555"
volumes:
- /cord/incubator/voltha/envoy:/etc/envoy
diff --git a/compose/docker-compose-voltha-swarm.yml b/compose/docker-compose-voltha-swarm.yml
index ff03c67..2084eb0 100644
--- a/compose/docker-compose-voltha-swarm.yml
+++ b/compose/docker-compose-voltha-swarm.yml
@@ -1,6 +1,6 @@
version: "3"
services:
- voltha:
+ vcore:
image: cord/voltha:latest
deploy:
replicas: 3
@@ -11,7 +11,7 @@
- --fluentd=fluentd:24224
- --kafka=kafka
- --rest-port=8880
- - --grpc-port=50555
+ - --grpc-port=50556
- --instance-id-is-container-name
- --interface=eth2
- --backend=consul
@@ -23,7 +23,7 @@
ports:
- "8880:8880"
- "18880:18880"
- - "50555:50555"
+ - "50556:50556"
volumes:
- /var/run/docker.sock:/tmp/docker.sock