commit 290e07d400b766d1429e15139688d0eb35d63913
author Jonathan Hart <jono@opennetworking.org> Mon Feb 05 09:31:29 2018 -0800
committer Jonathan Hart <jono@opennetworking.org> Tue Feb 27 11:27:50 2018 -0800
tree 082f4c027ab800de5da9c123458724983528cad2
parent 9add04033b3876424dfb32310a8fc9e9724cff9a

Fixes for VOLTHA-ONOS communication:

 * Add TLS parameters to ofagent
 * Add config-push container to get ONOS config pushed

Change-Id: Ia579c663108141cb466802fa55885f307fcb68c1

compose/voltha-stack.yml.j2

diff --git a/compose/voltha-stack.yml.j2 b/compose/voltha-stack.yml.j2
index 77d5d9d..f8f536f 100644
--- a/compose/voltha-stack.yml.j2
+++ b/compose/voltha-stack.yml.j2
@@ -302,6 +302,24 @@
     networks:
       - voltha-net
 
+  config_push:
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+    image: "${REGISTRY}${REPOSITORY}voltha-config-push:${TAG:-latest}"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
+    environment:
+      ONOS_CONNECTION: "onos:8181"
+      ONOS_USER: "karaf"
+      ONOS_PASSWORD: "karaf"
+    networks:
+      - voltha-net
+
   # The VCORE container is the core capabilities of VOLTHA including
   # interacting with device adapters
   vcore:
@@ -353,6 +371,9 @@
       - --controller=onos:6653
       - --grpc-endpoint=vcore:50556
       - --instance-id-is-container-name
+      - --enable-tls
+      - --key-file=/ofagent/pki/voltha.key
+      - --cert-file=/ofagent/pki/voltha.crt
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock
     networks:

docker/Dockerfile.configpush

diff --git a/docker/Dockerfile.configpush b/docker/Dockerfile.configpush
index f096852..fbba535 100644
--- a/docker/Dockerfile.configpush
+++ b/docker/Dockerfile.configpush
@@ -17,6 +17,7 @@
 RUN apk --update add curl
 
 COPY config/config-push /config-push
+RUN chmod +x /config-push
 COPY config/onos-config.json /data/onos-config.json
 
 VOLUME ["/data"]