Code Review
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Support of IPv6 by docker-compose
[oam.git]
/
solution
/
integration
/
smo
/
docker-compose.yml
diff --git
a/solution/integration/smo/docker-compose.yml
b/solution/integration/smo/docker-compose.yml
index
4e9bc59
..
2b34b32
100755
(executable)
--- 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:
- 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}
@@
-49,7
+50,8
@@
services:
- ./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:
@@
-77,7
+79,8
@@
services:
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
@@
-104,11
+107,11
@@
services:
integration:
aliases:
- kafka
integration:
aliases:
- kafka
- ipv4_address: ${
KAFKA_IP
}
-
+ ipv4_address: ${
IPv4_KAFKA
}
+ ipv6_address: ${IPv6_KAFKA}
depends_on:
- zookeeper
depends_on:
- zookeeper
-
onap-
dmaap:
+ dmaap:
container_name: onap-dmaap
image: ${DMAAP_IMAGE}
ports:
container_name: onap-dmaap
image: ${DMAAP_IMAGE}
ports:
@@
-117,36
+120,41
@@
services:
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}
+ vesc
ollector
:
+ image: ${VESC
OLLECTOR
_IMAGE}
container_name: vescollector
environment:
container_name: vescollector
environment:
- DMAAPHOST: "dmaap"
+ DMAAPHOST: "
onap-
dmaap"
ports:
- "8080:8080"
- "8443:8443"
volumes:
ports:
- "8080:8080"
- "8443:8443"
volumes:
- - ./vesc/collector.properties:/opt/app/VESCollector/etc/collector.properties
+ - ./vesc
ollector
/collector.properties:/opt/app/VESCollector/etc/collector.properties
networks:
integration:
networks:
integration:
- ipv4_address: ${VESCOLLECTOR_IP}
+ ipv4_address: ${IPv4_VESCOLLECTOR}
+ ipv6_address: ${IPv6_VESCOLLECTOR}
networks:
integration:
driver: bridge
networks:
integration:
driver: bridge
+ enable_ipv6: true
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}