From 20e6f94cdd6e22ef8aea03152c76f3c8a9026e50 Mon Sep 17 00:00:00 2001 From: demx8as6 Date: Fri, 26 Mar 2021 22:26:13 +0100 Subject: [PATCH] Support of IPv6 by docker-compose 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 --- solution/integration/smo/.env | 49 +++++++++++++++------- .../smo/{mr => dmaap}/MsgRtrApi.properties | 0 .../integration/smo/{mr => dmaap}/cadi.properties | 0 solution/integration/smo/{mr => dmaap}/logback.xml | 0 solution/integration/smo/docker-compose.yml | 42 +++++++++++-------- .../{vesc => vescollector}/collector.properties | 0 6 files changed, 60 insertions(+), 31 deletions(-) rename solution/integration/smo/{mr => dmaap}/MsgRtrApi.properties (100%) rename solution/integration/smo/{mr => dmaap}/cadi.properties (100%) rename solution/integration/smo/{mr => dmaap}/logback.xml (100%) rename solution/integration/smo/{vesc => vescollector}/collector.properties (100%) diff --git a/solution/integration/smo/.env b/solution/integration/smo/.env index b2cd3f9..86810e0 100644 --- a/solution/integration/smo/.env +++ b/solution/integration/smo/.env @@ -16,25 +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 -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 +# 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 -ESDB_IP=172.40.0.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 # dependent components -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 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 diff --git a/solution/integration/smo/mr/MsgRtrApi.properties b/solution/integration/smo/dmaap/MsgRtrApi.properties similarity index 100% rename from solution/integration/smo/mr/MsgRtrApi.properties rename to solution/integration/smo/dmaap/MsgRtrApi.properties diff --git a/solution/integration/smo/mr/cadi.properties b/solution/integration/smo/dmaap/cadi.properties similarity index 100% rename from solution/integration/smo/mr/cadi.properties rename to solution/integration/smo/dmaap/cadi.properties diff --git a/solution/integration/smo/mr/logback.xml b/solution/integration/smo/dmaap/logback.xml similarity index 100% rename from solution/integration/smo/mr/logback.xml rename to solution/integration/smo/dmaap/logback.xml diff --git a/solution/integration/smo/docker-compose.yml b/solution/integration/smo/docker-compose.yml index 4e9bc59..2b34b32 100755 --- a/solution/integration/smo/docker-compose.yml +++ b/solution/integration/smo/docker-compose.yml @@ -22,7 +22,8 @@ services: - discovery.type=single-node networks: integration: - ipv4_address: ${ESDB_IP} + ipv4_address: ${IPv4_SDNRDB} + ipv6_address: ${IPv6_SDNRDB} sdnr: image: ${SDNC_IMAGE} @@ -49,7 +50,8 @@ services: - ./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: @@ -77,7 +79,8 @@ services: integration: aliases: - zookeeper - ipv4_address: ${ZOOKEEPER_IP} + ipv4_address: ${IPv4_ZOOKEEPER} + ipv6_address: ${IPv6_ZOOKEEPER} kafka: image: ${KAFKA_IMAGE} container_name: kafka @@ -104,11 +107,11 @@ services: integration: aliases: - kafka - ipv4_address: ${KAFKA_IP} - + ipv4_address: ${IPv4_KAFKA} + ipv6_address: ${IPv6_KAFKA} depends_on: - zookeeper - onap-dmaap: + dmaap: container_name: onap-dmaap image: ${DMAAP_IMAGE} ports: @@ -117,36 +120,41 @@ services: 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 - ipv4_address: ${DMAAP_IP} + ipv4_address: ${IPv4_DMAAP} + ipv6_address: ${IPv6_DMAAP} depends_on: - zookeeper - kafka - vesc: - image: ${VESC_IMAGE} + vescollector: + image: ${VESCOLLECTOR_IMAGE} container_name: vescollector environment: - DMAAPHOST: "dmaap" + DMAAPHOST: "onap-dmaap" ports: - "8080:8080" - "8443:8443" volumes: - - ./vesc/collector.properties:/opt/app/VESCollector/etc/collector.properties + - ./vescollector/collector.properties:/opt/app/VESCollector/etc/collector.properties networks: integration: - ipv4_address: ${VESCOLLECTOR_IP} + ipv4_address: ${IPv4_VESCOLLECTOR} + ipv6_address: ${IPv6_VESCOLLECTOR} networks: integration: driver: bridge + enable_ipv6: true ipam: driver: default config: - - subnet: ${NETWORK_SUBNET} - gateway: ${GATEWAY_IP} + - subnet: ${IPv4_NETWORK_SUBNET} + gateway: ${IPv4_GATEWAY} + - subnet: ${IPv6_NETWORK_SUBNET} + gateway: ${IPv6_GATEWAY} diff --git a/solution/integration/smo/vesc/collector.properties b/solution/integration/smo/vescollector/collector.properties similarity index 100% rename from solution/integration/smo/vesc/collector.properties rename to solution/integration/smo/vescollector/collector.properties -- 2.16.6