Automate injection of 3GPP yaml files

[oam.git] / solution / smo / oam / docker-compose.yml

diff --git a/solution/smo/oam/docker-compose.yml b/solution/smo/oam/docker-compose.yml
index 1f8b1fd..2a4bd22 100755 (executable)
--- a/solution/smo/oam/docker-compose.yml
+++ b/solution/smo/oam/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - WEBPROTOCOL=HTTP
       - WEBPORT=${SDNC_WEB_PORT}
       - SDNRPROTOCOL=http
-      - SDNRHOST=sdnr
+      - SDNRHOST=controller
       - SDNRPORT=${SDNC_REST_PORT}
     labels:
       traefik.enable: true
@@ -18,15 +18,26 @@ services:
       traefik.http.routers.sdnc-web.rule: Host(`odlux.oam.${SOLUTION_DOMAIN}`)
       traefik.http.routers.sdnc-web.tls: true
       traefik.http.services.sdnc-web.loadbalancer.server.port: ${SDNC_WEB_PORT}
+    depends_on:
+      controller:
+        condition: service_healthy
     networks:
       smo:
 
-  sdnr:
+  controller:
     image: ${SDNC_IMAGE}
-    container_name: sdnr
-    hostname: sdnr
+    container_name: controller
+    hostname: controller
+    extra_hosts:
+      - "identity.smo.o-ran-sc.org:${HOST_IP}"
+    healthcheck:
+      test: wget -U ${ADMIN_USERNAME}:${ADMIN_PASSWORD} --no-verbose --tries=1 --spider http://localhost:${SDNC_REST_PORT}/ready || exit 1
+      start_period: 60s
+      interval: 10s
+      timeout: 5s
+      retries: 5
     ports:
-      - 6666:6666
+      - 4334:4334
       - 4335:4335
     environment:
       - ENABLE_ODL_CLUSTER=false
@@ -63,17 +74,21 @@ services:
       - ./controller/mountpoint-registrar.properties:/opt/opendaylight/etc/mountpoint-registrar.properties
     labels:
       traefik.enable: true
-      traefik.http.routers.sdnr.entrypoints: websecure
-      traefik.http.routers.sdnr.rule: Host(`controller.oam.${SOLUTION_DOMAIN}`)
-      traefik.http.routers.sdnr.tls: true
-      traefik.http.services.sdnr.loadbalancer.server.port: 8181
+      traefik.http.routers.controller.entrypoints: websecure
+      traefik.http.routers.controller.rule: Host(`controller.oam.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.controller.tls: true
+      traefik.http.services.controller.loadbalancer.server.port: ${SDNC_REST_PORT}
     networks:
       smo:
       default:
         ipv6_address: ${SDNC_OAM_IPv6}
 
   ves-collector:
-    image: ${VES_COLLECTOR_IMAGE}
+    image: ${VES_COLLECTOR_IMAGE}-configured
+    build:
+      context: ./ves-collector
+      args:
+        - BASEIMAGE=${VES_COLLECTOR_IMAGE}
     container_name: ves-collector
     hostname: ves-collector
     environment:
@@ -81,7 +96,6 @@ services:
     volumes:
       - ./ves-collector/collector.properties:/opt/app/VESCollector/etc/collector.properties
       - ./ves-collector/ves-dmaap-config.json:/opt/app/VESCollector/etc/ves-dmaap-config.json
-      - ./ves-collector/externalRepo:/opt/app/VESCollector/etc/externalRepo
     labels:
       traefik.enable: true
       traefik.http.routers.ves.entrypoints: websecure
@@ -102,4 +116,4 @@ networks:
       driver: default
       config:
       - subnet:  "${NETWORK_SUBNET_OAM_IPv6}"
-        gateway: "${NETWORK_GATEWAY_OAM_IPv6}"
\ No newline at end of file
+        gateway: "${NETWORK_GATEWAY_OAM_IPv6}"