Merge "Late updates on integration deployment"

diff --git a/solution/integration/network/.env b/solution/integration/network/.env
index f9414b8..756cd75 100644 (file)
--- a/solution/integration/network/.env
+++ b/solution/integration/network/.env
@@ -45,8 +45,8 @@ NTS_HOST_TRANSFER_SFTP_BASE_PORT=2000
 NTS_NF_MOUNT_POINT_ADDRESSING_METHOD=docker-mapping
 
 SDN_CONTROLLER_PROTOCOL=http
-SDN_CONTROLLER_CALLHOME_PORT=6666
-# TLS: SDN_CONTROLLER_CALLHOME_PORT=4335
+# ssh: SDN_CONTROLLER_CALLHOME_PORT=6666
+SDN_CONTROLLER_CALLHOME_PORT=4335
 
 VES_COMMON_HEADER_VERSION=7.2.1
 VES_ENDPOINT_PROTOCOL=https

diff --git a/solution/integration/network/docker-compose.yml b/solution/integration/network/docker-compose.yml
index be9e08e..8e0921d 100755 (executable)
--- a/solution/integration/network/docker-compose.yml
+++ b/solution/integration/network/docker-compose.yml
@@ -31,6 +31,7 @@ x-common_env: &common_env
     SDN_CONTROLLER_PROTOCOL: ${SDN_CONTROLLER_PROTOCOL}
     SDN_CONTROLLER_IP: ${SDNC_OAM_IPv6}
     SDN_CONTROLLER_PORT: ${SDNC_REST_PORT}
+    SDN_CONTROLLER_CALLHOME_IP: ${SDNC_OAM_IPv6}
     SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_PORT}
     SDN_CONTROLLER_USERNAME: ${ADMIN_USERNAME}
     SDN_CONTROLLER_PASSWORD: ${ADMIN_PASSWORD}