From 830f8faec746f8bc3334eae16eaeb57ba42951a8 Mon Sep 17 00:00:00 2001 From: demx8as6 Date: Wed, 5 Jul 2023 16:42:22 +0000 Subject: [PATCH] repo clean-up - rename SOLUTION_DOMAIN env to HTTP_DOMAIN - use ${env} within .env Issue-ID: OAM-346 Change-Id: I4b0abebc7b8ddfbcc632816b3868877f95903faa Signed-off-by: demx8as6 --- solution/network/.env | 8 ++++---- solution/smo/common/.env | 6 +++--- solution/smo/oam/.env | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/solution/network/.env b/solution/network/.env index b0dac8a..c61b04e 100644 --- a/solution/network/.env +++ b/solution/network/.env @@ -23,19 +23,19 @@ ADMIN_USERNAME=admin ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U # gateway network implemented by traefik -GATEWAY_DOMAIN=smo.o-ran-sc.org +HTTP_DOMAIN=smo.o-ran-sc.org # SDN Controller SDN_CONTROLLER_PROTOCOL=https -SDNC_OAM_HOST=odlux.oam.smo.o-ran-sc.org -SDNC_DCN_HOST=controller.dcn.smo.o-ran-sc.org +SDNC_OAM_HOST=odlux.oam.${HTTP_DOMAIN} +SDNC_DCN_HOST=controller.dcn.${HTTP_DOMAIN} SDNC_REST_PORT=443 SDN_CONTROLLER_CALLHOME_SSH_PORT=4334 SDN_CONTROLLER_CALLHOME_TLS_PORT=4335 # VES Collector VES_ENDPOINT_PROTOCOL=https -VES_COLLECTOR_DCN_HOST=ves-collector.dcn.smo.o-ran-sc.org +VES_COLLECTOR_DCN_HOST=ves-collector.dcn.${HTTP_DOMAIN} VES_ENDPOINT_PORT=443 VES_COMMON_HEADER_VERSION=7.2.1 VES_ENDPOINT_AUTH_METHOD=basic-auth diff --git a/solution/smo/common/.env b/solution/smo/common/.env index 55e74cd..cc337b4 100644 --- a/solution/smo/common/.env +++ b/solution/smo/common/.env @@ -24,8 +24,8 @@ ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U NETWORK_SUBNET_DCN_IPv6=2001:db8:1:50::/96 # gateway network implemented by traefik -SOLUTION_DOMAIN=smo.o-ran-sc.org -TRAEFIK_IMAGE=traefik:v2.9 +HTTP_DOMAIN=smo.o-ran-sc.org +TRAEFIK_IMAGE=traefik:v2.9.6 TRAEFIK_LOG_LEVEL=DEBUG TRAEFIK_NETWORK_NAME=dmz @@ -35,7 +35,7 @@ IDENTITYDB_IMAGE=docker.io/bitnami/postgresql:13 IDENTITY_MGMT_USERNAME=manager IDENTITY_MGMT_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U # IDENTITY_PORT_HTTPS=8463 -IDENTITY_PROVIDER_URL=https://identity.smo.o-ran-sc.org +IDENTITY_PROVIDER_URL=https://identity.${HTTP_DOMAIN} # PERSISTENCE (including SDN-R Database) PERSISTENCE_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3 diff --git a/solution/smo/oam/.env b/solution/smo/oam/.env index 5c85a92..d17e8f2 100644 --- a/solution/smo/oam/.env +++ b/solution/smo/oam/.env @@ -22,10 +22,10 @@ ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U HOST_IP=aaa.bbb.ccc.ddd # traefik network -SOLUTION_DOMAIN=smo.o-ran-sc.org +HTTP_DOMAIN=smo.o-ran-sc.org # Identity server -IDENTITY_PROVIDER_URL=https://identity.smo.o-ran-sc.org +IDENTITY_PROVIDER_URL=https://identity.${HTTP_DOMAIN} # SDN Controller SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.4.2 -- 2.16.6