Enable IPv6 flag and related subnetwork added.
Identifiers are updated to be more consistent.
Dont change "onap-dmaap".
IssueID: OAM-176
Change-Id: I2edb01187a31c4bd11e71b2833d534aeb7a0a0cb
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>
-NETWORK_SUBNET=172.40.0.0/16
-GATEWAY_IP=172.40.0.1
-SDNR_IP=172.40.0.21
-ODL_CERT_DIR=/opt/opendaylight/current/certs
-ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.1.1
+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
SDNRDB_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3
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.1
+IPv4_SDNC=172.40.0.21
+IPv6_SDNC=2001:db8:1:1::21
+ODL_CERT_DIR=/opt/opendaylight/current/certs
+ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.9.0
-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_IMAGE=nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.3
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
+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
- discovery.type=single-node
networks:
integration:
- discovery.type=single-node
networks:
integration:
- ipv4_address: ${ESDB_IP}
+ ipv4_address: ${IPv4_SDNRDB}
+ ipv6_address: ${IPv6_SDNRDB}
sdnr:
image: ${SDNC_IMAGE}
sdnr:
image: ${SDNC_IMAGE}
- ./sdnr/certs/keys0.zip:${ODL_CERT_DIR}/keys0.zip
networks:
integration:
- ./sdnr/certs/keys0.zip:${ODL_CERT_DIR}/keys0.zip
networks:
integration:
- ipv4_address: ${SDNR_IP}
+ ipv4_address: ${IPv4_SDNC}
+ ipv6_address: ${IPv6_SDNC}
logging:
driver: "json-file"
options:
logging:
driver: "json-file"
options:
integration:
aliases:
- zookeeper
integration:
aliases:
- zookeeper
- ipv4_address: ${ZOOKEEPER_IP}
+ ipv4_address: ${IPv4_ZOOKEEPER}
+ ipv6_address: ${IPv6_ZOOKEEPER}
kafka:
image: ${KAFKA_IMAGE}
container_name: kafka
kafka:
image: ${KAFKA_IMAGE}
container_name: kafka
integration:
aliases:
- kafka
integration:
aliases:
- kafka
- ipv4_address: ${KAFKA_IP}
-
+ ipv4_address: ${IPv4_KAFKA}
+ ipv6_address: ${IPv6_KAFKA}
container_name: onap-dmaap
image: ${DMAAP_IMAGE}
ports:
container_name: onap-dmaap
image: ${DMAAP_IMAGE}
ports:
environment:
enableCadi: 'false'
volumes:
environment:
enableCadi: 'false'
volumes:
- - ./mr/MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
- - ./mr/logback.xml:/appl/dmaapMR1/bundleconfig/etc/logback.xml
- - ./mr/cadi.properties:/appl/dmaapMR1/etc/cadi.properties
+ - ./dmaap/MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
+ - ./dmaap/logback.xml:/appl/dmaapMR1/bundleconfig/etc/logback.xml
+ - ./dmaap/cadi.properties:/appl/dmaapMR1/etc/cadi.properties
networks:
integration:
aliases:
- dmaap
networks:
integration:
aliases:
- dmaap
- ipv4_address: ${DMAAP_IP}
+ ipv4_address: ${IPv4_DMAAP}
+ ipv6_address: ${IPv6_DMAAP}
depends_on:
- zookeeper
- kafka
depends_on:
- zookeeper
- kafka
- vesc:
- image: ${VESC_IMAGE}
+ vescollector:
+ image: ${VESCOLLECTOR_IMAGE}
container_name: vescollector
environment:
container_name: vescollector
environment:
+ DMAAPHOST: "onap-dmaap"
ports:
- "8080:8080"
- "8443:8443"
volumes:
ports:
- "8080:8080"
- "8443:8443"
volumes:
- - ./vesc/collector.properties:/opt/app/VESCollector/etc/collector.properties
+ - ./vescollector/collector.properties:/opt/app/VESCollector/etc/collector.properties
- ipv4_address: ${VESCOLLECTOR_IP}
+ ipv4_address: ${IPv4_VESCOLLECTOR}
+ ipv6_address: ${IPv6_VESCOLLECTOR}
networks:
integration:
driver: bridge
networks:
integration:
driver: bridge
ipam:
driver: default
config:
ipam:
driver: default
config:
- - subnet: ${NETWORK_SUBNET}
- gateway: ${GATEWAY_IP}
+ - subnet: ${IPv4_NETWORK_SUBNET}
+ gateway: ${IPv4_GATEWAY}
+ - subnet: ${IPv6_NETWORK_SUBNET}
+ gateway: ${IPv6_GATEWAY}