################################################################################
-# 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.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
- discovery.type=single-node
networks:
integration:
- ipv4_address: ${ESDB_IP}
+ ipv4_address: ${IPv4_SDNRDB}
+ ipv6_address: ${IPv6_SDNRDB}
sdnr:
image: ${SDNC_IMAGE}
ports:
- "8181:8181"
- "8101:8101"
-#entrypoint: ["/bin/bash", "/opt/onap/sdnc/bin/startODL.oom.sh"]
environment:
- SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
- ODL_CERT_DIR=${ODL_CERT_DIR}
- SDNRINIT=true
- SDNRONLY=true
- SDNRDBURL=http://sdnrdb:9200
+ - A1_ADAPTER_NORTHBOUND=false
+ - ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD}
+ - JAVA_OPTS=-Xms256m -Xmx2g
volumes:
- ./sdnr/mountpoint-registrar.properties:/opt/opendaylight/etc/mountpoint-registrar.properties
- ./sdnr/certs/certs.properties:${ODL_CERT_DIR}/certs.properties
- ./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:
integration:
aliases:
- zookeeper
- ipv4_address: ${ZOOKEEPER_IP}
+ ipv4_address: ${IPv4_ZOOKEEPER}
+ ipv6_address: ${IPv6_ZOOKEEPER}
kafka:
image: ${KAFKA_IMAGE}
container_name: kafka
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:
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}
\ No newline at end of file
+ - subnet: ${IPv4_NETWORK_SUBNET}
+ gateway: ${IPv4_GATEWAY}
+ - subnet: ${IPv6_NETWORK_SUBNET}
+ gateway: ${IPv6_GATEWAY}