Code Review
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes from topics "OAM-344", "OAM-345"
[oam.git]
/
solution
/
smo
/
common
/
.env
diff --git
a/solution/smo/common/.env
b/solution/smo/common/.env
index
7d5e497
..
55e74cd
100644
(file)
--- a/
solution/smo/common/.env
+++ b/
solution/smo/common/.env
@@
-21,19
+21,13
@@
ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
# Network settings
# Please update /etc/docker/daemon.json accordingly
# https://docs.docker.com/config/daemon/ipv6/
# Network settings
# Please update /etc/docker/daemon.json accordingly
# https://docs.docker.com/config/daemon/ipv6/
-NETWORK_SUBNET_SMO=2001:db8:1:40::/96
-NETWORK_GATEWAY_SMO=2001:db8:1:40::1
+NETWORK_SUBNET_DCN_IPv6=2001:db8:1:50::/96
-#
traefik networ
k
+#
gateway network implemented by traefi
k
SOLUTION_DOMAIN=smo.o-ran-sc.org
TRAEFIK_IMAGE=traefik:v2.9
TRAEFIK_LOG_LEVEL=DEBUG
SOLUTION_DOMAIN=smo.o-ran-sc.org
TRAEFIK_IMAGE=traefik:v2.9
TRAEFIK_LOG_LEVEL=DEBUG
-TRAEFIK_NETWORK_NAME=smo
-TRAEFIK_SUBNET=172.30.0.0/16
-TRAEFIK_SUBNET_IPv6=2001:db8:1:30::/64
-TRAEFIK_SUBNET_IPv6_PRE_STRING=2001:db8:1:30
-TRAEFIK_GATEWAY_IP=172.30.0.1
-TRAEFIK_GATEWAY_IPv6=${TRAEFIK_SUBNET_IPv6_PRE_STRING}:172:30:0:1
+TRAEFIK_NETWORK_NAME=dmz
# Identity server
IDENTITY_IMAGE=bitnami/keycloak:18.0.2
# Identity server
IDENTITY_IMAGE=bitnami/keycloak:18.0.2
@@
-51,6
+45,11
@@
ZOOKEEPER_IMAGE=nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.3
## Kafka
KAFKA_IMAGE=nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.4
## Kafka
KAFKA_IMAGE=nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.4
+KAFKA_BRIDGE_IMAGE=quay.io/strimzi/kafka-bridge:0.25.0
## Messages (DMaaP)
DMAAP_IMAGE=nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.18
## Messages (DMaaP)
DMAAP_IMAGE=nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.18
+
+## Topology
+O_RAN_SC_TOPOLOGY_IMAGE=nexus3.o-ran-sc.org:10002/o-ran-sc/smo-nts-ng-topology-server:1.5.2
+