From c123ff305cf9367a28dadcc60105f3cf2b30a0bc Mon Sep 17 00:00:00 2001 From: Martin Skorupski Date: Sun, 30 Nov 2025 16:51:27 +0100 Subject: [PATCH] Modify M-Release images to OAM Solution Issue-ID: OAM-534 Change-Id: I33d8bf9de74f4b5cf6057a9d2acdf6b2aed979b4 Signed-off-by: Martin Skorupski --- solution/network/.env | 2 +- solution/network/docker-compose.yaml | 3 ++- solution/smo/oam/.env | 8 ++++---- solution/smo/oam/controller/certs/keys0.zip | Bin 3856 -> 3838 bytes 4 files changed, 7 insertions(+), 6 deletions(-) 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 d3d45fe5e82b1ac9fe8ea786ab6886f906de401d..28a34bdd4a25961ea6374e3a9cbdc72424a997e8 100644 GIT binary patch delta 1602 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