VOL-1343 Disable TLS in ofagent compose and onos Docker build
This change allows onos development builds to be more easily tested
in a wider range of environments. The base onosproject/onos build
does not have TLS certs built in. Now that the voltha dev build
does not it can be swapped in places where onosproject/onos is running
without TLS mismatch configuration problems.
Also update the docker-compose dev setup scripts for ofagent to disable TLS,
again to be consistent with onos and helm deployed versions of ofagent.
Change-Id: I8a3d2c02e7091200bd318edd170c1fb26d34e068
diff --git a/compose/docker-compose-ofagent-test.yml b/compose/docker-compose-ofagent-test.yml
index 6f24e8d..fc7a276 100644
--- a/compose/docker-compose-ofagent-test.yml
+++ b/compose/docker-compose-ofagent-test.yml
@@ -193,7 +193,7 @@
#
ofagent:
image: "${REGISTRY}${REPOSITORY}voltha-ofagent${TAG}"
- command: /ofagent/ofagent/main.py -v --consul=${DOCKER_HOST_IP}:8500 --controller ${DOCKER_HOST_IP}:6633 ${DOCKER_HOST_IP}:6644 ${DOCKER_HOST_IP}:6655 --grpc-endpoint=@voltha-grpc --instance-id-is-container-name --enable-tls --key-file=/ofagent/pki/voltha.key --cert-file=/ofagent/pki/voltha.crt
+ command: /ofagent/ofagent/main.py -v --consul=${DOCKER_HOST_IP}:8500 --controller ${DOCKER_HOST_IP}:6633 ${DOCKER_HOST_IP}:6644 ${DOCKER_HOST_IP}:6655 --grpc-endpoint=@voltha-grpc --instance-id-is-container-name
depends_on:
- vconsul
- voltha