Add healthcheck to oam-controller deployment

- in addition also the callhome port was updated
- odlux got a dependency to oam-controller

IssueID: OAM-312, OAM-313
Change-Id: I45d213fc390a762c3f99416fe864efd9e8b6e4ef
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/solution/README.md b/solution/README.md
index 1dcbbcd..1bd4e4b 100644 (file)
--- a/solution/README.md
+++ b/solution/README.md
@@ -20,18 +20,16 @@ with the following components.
     ... representing an KeyCloak based identity service for centralized user
     management. Please note that the implementation does not support IPv6.
     Therefore, its own network is required called 'DMZ'.
-    In this configuration the external https port is 8463.
 
   * **Controller** single node instance
 
     ... representing the NETCONF consumer on the Service Management and
     Orchestration framework (SMO) for the O1 interface based on
     ODL.
-    SDN-R comes with is own web-portal the external port is 8463.
 
   * **VES collector**
 
-    ... representing the VES (REST) provider at SMO for all kind of events. In this configuration the external https port is 8443.
+    ... representing the VES (REST) provider at SMO for all kind of events.
 
   * **Messages**
     ... representing SMO MessageRouter component, includes message-router
@@ -206,12 +204,6 @@ nano smo/oam/.env
 nano network/.env
 ```
 
-The tested configuration uses the following external https ports:
-
- * 8443 for the ves-collector
- * 8453 for web access to ODLUX (SDNC_WEB_PORT)
- * 8463 for the keyclock web administrator user interface.
-
 #### Startup solution
 
 Please note that it is necessary to configure first the identity service,
@@ -235,16 +227,10 @@ docker-compose -f smo/oam/docker-compose.yml up -d
 Looking into the ONAP SDN-R logs will give you the startup procedure.
 
 ```
-docker logs -f sdnr
-```
-
-The startup was successful when you see the following line:
-
-```
-Everything OK in Certificate Installation
+docker logs -f controller
 ```
 
-If you see the login page (https://sdnc-web:8453) you are good to go and can start the (simulated) network.
+If you see the login page (https://odlux.oam.smo.o-ran-sc.org) you are good to go and can start the (simulated) network.
 
 ```
 docker-compose -f network/docker-compose.yml up -d
@@ -278,7 +264,7 @@ Finally the fault events are visible in ODLUX.
 #### ODL karaf.logs
 
 ```
-docker exec -it sdnr tail -f /opt/opendaylight/data/log/karaf.log
+docker exec -it controller tail -f /opt/opendaylight/data/log/karaf.log
 ```
 
 #### ves-collector logs
@@ -297,7 +283,7 @@ docker logs -f ves-collector
 
 ##### Login into SDN-R
 
-    https://sdnc-web:8453
+    https://odlux.oam.smo.o-ran-sc.org
 
     User: admin // see .env file
 
@@ -311,6 +297,7 @@ To stop all container please respect the following order
 
 ```
 docker-compose -f network/docker-compose.yml down
+docker-compose -f smo/apps/docker-compose.yml down
 docker-compose -f smo/oam/docker-compose.yml down
 docker-compose -f smo/common/docker-compose.yml down
 ```
@@ -332,3 +319,4 @@ The commands ...
 ```
 docker ps -a
 docker-compose ps
+docker rm -f $(docker ps -aq)

diff --git a/solution/smo/oam/docker-compose.yml b/solution/smo/oam/docker-compose.yml
index 57c5553..9d2c5b5 100755 (executable)
--- a/solution/smo/oam/docker-compose.yml
+++ b/solution/smo/oam/docker-compose.yml
@@ -18,6 +18,9 @@ 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:
 
@@ -25,6 +28,12 @@ services:
     image: ${SDNC_IMAGE}
     container_name: controller
     hostname: controller
+    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:
       - 4334:4334
       - 4335:4335
@@ -66,7 +75,7 @@ services:
       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: 8181
+      traefik.http.services.controller.loadbalancer.server.port: ${SDNC_REST_PORT}
     networks:
       smo:
       default: