X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=solution%2Fintegration%2Fsmo%2F.env;h=fde8c3760a9b01d643faf91408d18f40c2c6d3fc;hb=0d8a83b634100eb2f07e670ef54b9d0caa0f7a4e;hp=c14546feb2bf1cccd9c585b306738614a11dfaf9;hpb=405815ecf904464de924b0cfcd10df540613b0ae;p=oam.git

diff --git a/solution/integration/smo/.env b/solution/integration/smo/.env
index c14546f..fde8c37 100644
--- a/solution/integration/smo/.env
+++ b/solution/integration/smo/.env
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright 2020 highstreet technologies and others
+# Copyright 2021 highstreet technologies and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,24 +16,46 @@
 
 COMPOSE_PROJECT_NAME=smo
 
+# Network settings
 NETWORK_NAME=integration
-NETWORK_SUBNET=172.40.0.0/16
-GATEWAY_IP=172.40.0.1
 
-SDNR_IP=172.40.0.21
+IPv4_NETWORK_SUBNET=172.40.0.0/16
+IPv4_GATEWAY=172.40.0.1
+
+# Please update /etc/docker/daemon.json accordingly
+# https://docs.docker.com/config/daemon/ipv6/
+IPv6_NETWORK_SUBNET=2001:db8:1:1::/64
+IPv6_GATEWAY=2001:db8:1:1::1
+
+# SDN-R Database
+SDNRDB_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3
+IPv4_SDNRDB=172.40.0.30
+IPv6_SDNRDB=2001:db8:1:1::30
+
+# SDN Controller
+SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.1.3
+IPv4_SDNC=172.40.0.21
+IPv6_SDNC=2001:db8:1:1::21
 ODL_CERT_DIR=/opt/opendaylight/current/certs
 ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.0.3
-SDNRDB_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss:7.6.1
-
-ESDB_IP=172.40.0.30
 
 # dependent components
-VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest
-DMAAP_IMAGE=nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.18
-KAFKA_IMAGE=nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.4
+## ZooKeeper
 ZOOKEEPER_IMAGE=nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.3
-ZOOKEEPER_IP=172.40.0.60
-KAFKA_IP=172.40.0.70
-DMAAP_IP=172.40.0.80
-VESCOLLECTOR_IP=172.40.0.90
\ No newline at end of file
+IPv4_ZOOKEEPER=172.40.0.60
+IPv6_ZOOKEEPER=2001:db8:1:1::60
+
+## Kafka
+KAFKA_IMAGE=nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.4
+IPv4_KAFKA=172.40.0.70
+IPv6_KAFKA=2001:db8:1:1::70
+
+## DMaaP
+DMAAP_IMAGE=nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.18
+IPv4_DMAAP=172.40.0.80
+IPv6_DMAAP=2001:db8:1:1::80
+
+## VES Collector
+VESCOLLECTOR_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.9.0
+IPv4_VESCOLLECTOR=172.40.0.90
+IPv6_VESCOLLECTOR=2001:db8:1:1::90