From: Martin Skorupski Date: Sun, 30 Nov 2025 15:51:27 +0000 (+0100) Subject: Modify M-Release images to OAM Solution X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F15322%2F1;p=oam.git Modify M-Release images to OAM Solution Issue-ID: OAM-534 Change-Id: I33d8bf9de74f4b5cf6057a9d2acdf6b2aed979b4 Signed-off-by: Martin Skorupski --- diff --git a/solution/network/.env b/solution/network/.env index 17ea203..64e62e5 100644 --- a/solution/network/.env +++ b/solution/network/.env @@ -20,7 +20,7 @@ NETWORK_SUBNET_DCN_IPv6=2001:db8:1:50::/96 # Credentials ADMIN_USERNAME=admin -ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +ADMIN_PASSWORD=admin # gateway network implemented by traefik HTTP_DOMAIN=smo.o-ran-sc.org diff --git a/solution/network/docker-compose.yaml b/solution/network/docker-compose.yaml index 51b8870..9dba883 100755 --- a/solution/network/docker-compose.yaml +++ b/solution/network/docker-compose.yaml @@ -16,7 +16,8 @@ x-common_env: &common_env SDNR_RESTCONF_URL: ${SDNR_RESTCONF_URL} SDNR_USERNAME: ${ADMIN_USERNAME} - SDNR_PASSWORD: ${ADMIN_PASSWORD} + SDNR_PASSWORD: ${ADMIN_PASSWORD} + SDNR_CERTIFICATE_MARKERS: True x-du_env: &du_env NETCONF_USERNAME: ${NETCONF_USERNAME} diff --git a/solution/smo/oam/.env b/solution/smo/oam/.env index 12c098d..e6aedea 100644 --- a/solution/smo/oam/.env +++ b/solution/smo/oam/.env @@ -16,7 +16,7 @@ # Credentials ADMIN_USERNAME=admin -ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +ADMIN_PASSWORD=admin # Network settings HOST_IP=aaa.bbb.ccc.ddd @@ -28,14 +28,14 @@ HTTP_DOMAIN=smo.o-ran-sc.org IDENTITY_PROVIDER_URL=https://identity.${HTTP_DOMAIN} # SDN Controller -SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.6.1 +SDNC_IMAGE=nexus3.o-ran-sc.org:10001/o-ran-sc/oam-oam-controller/sdnr-image:13.0.1 SDNC_REST_PORT=8181 -SDNR_WEBSOCKET_PORT=8182 +SDNR_WEBSOCKET_PORT=8183 SDNC_CERT_DIR=/opt/opendaylight/current/certs SDNC_ENABLE_OAUTH=true # SDN Controller Web -SDNC_WEB_IMAGE=nexus3.onap.org:10001/onap/sdnc-web-image:2.6.1 +SDNC_WEB_IMAGE=nexus3.o-ran-sc.org:10001/o-ran-sc/oam-oam-controller/sdnr-web-image:13.0.1 SDNC_WEB_PORT=8080 ## VES Collector diff --git a/solution/smo/oam/controller/certs/keys0.zip b/solution/smo/oam/controller/certs/keys0.zip index d3d45fe..28a34bd 100644 Binary files a/solution/smo/oam/controller/certs/keys0.zip and b/solution/smo/oam/controller/certs/keys0.zip differ