commit 29dd1987b0e63d3ba500b8cb92aafd0b0a1b13c9
author Richard Jankowski <rjankows@ciena.com> Wed Jun 28 13:30:18 2017 -0400
committer khenaidoo Nursimulu <knursimu@ciena.com> Wed Jun 28 18:38:07 2017 -0700
tree 94ba9132317b06816eef2567180e28b40655f079
parent b96ee0a30bcf98ee09208e857bcc172dfee36ff1

VOL-211: Integrate a clustered Consul service with all Voltha components that use it

The Dockerfile for the CLI container runs a setup.sh script at container startup.
This script hard-codes the Consul lookup (-L) and endpoint (-C) arguments passed
to /cli/cli/main.py. In Docker swarm mode, Consul is no longer used for service
lookup; instead, Docker's DNS is used. It is desirable that the lookup argument
be specified in the compose file. For v2 -L is supplied and the Voltha gRPC and
SIM endpoints are specified by Consul service name. For v3 -L is withheld and the
Voltha gRPC and SIM endpoints are specified by Docker service name. Therefore, in
addition to a new v3 compose file for use by Docker swarm, the existing v2 compose
file used by the single-node Voltha implementation must be changed.

Change-Id: Ifef3e06ef9479594bfb11328dd1b1004e4f6c74f

compose/docker-compose-system-test-encrypted.yml

diff --git a/compose/docker-compose-system-test-encrypted.yml b/compose/docker-compose-system-test-encrypted.yml
index d6c4c25..55063da 100644
--- a/compose/docker-compose-system-test-encrypted.yml
+++ b/compose/docker-compose-system-test-encrypted.yml
@@ -156,6 +156,10 @@
   #
   vcli:
     image: cord/vcli
+    command: [
+      "/cli/cli/setup.sh",
+      "-L"
+    ]
     environment:
       DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
     ports:

compose/docker-compose-system-test.yml

diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 7d15c16..2e2185c 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -154,6 +154,10 @@
   #
   vcli:
     image: cord/vcli
+    command: [
+      "/cli/cli/setup.sh",
+      "-L"
+    ]
     environment:
       DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
     ports:

compose/docker-compose-vcli.yml

diff --git a/compose/docker-compose-vcli.yml b/compose/docker-compose-vcli.yml
new file mode 100644
index 0000000..f3aafa3
--- /dev/null
+++ b/compose/docker-compose-vcli.yml
@@ -0,0 +1,32 @@
+#
+# This Docker stackfile deploys a Voltha CLI container along with one backup.
+#
+# The stackfile assumes that overlay network 'voltha_net' has already been
+# created. To deploy the stack, issue the command:
+#
+#     docker stack deploy -c docker-compose-vcli.yml cli
+#
+
+version: "3"
+services:
+  cli:
+    image: cord/vcli:latest
+    deploy:
+      replicas: 2
+    environment:
+      DOCKER_HOST_IP: "${DOCKER_HOST_IP}"
+    entrypoint:
+      - /cli/cli/setup.sh
+      - -C consul:8500
+      - -g voltha:50555
+      - -s voltha:18880
+    networks:
+      - voltha-net
+    ports:
+      - "5022:22"
+      
+networks:
+  voltha-net:
+    external:
+      name: voltha_net
+