Fix installation to use 9 tag as default for docker images

[osm/devops.git] / installers / docker / docker-compose.yaml

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 25ed061..0877d81 100644 (file)
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -40,10 +40,10 @@ services:
     networks:
       - netOSM
     healthcheck:
-      test: echo stat | nc localhost 2181
-      interval: 10s
+      test: echo ruok | nc -w 2 localhost 2181
+      interval: 20s
       timeout: 10s
-      retries: 3
+      retries: 5
     logging:
       driver: "json-file"
       options:
@@ -65,12 +65,10 @@ services:
       KAFKA_LISTENERS: PLAINTEXT://:9092
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'false'
-      KAFKA_CREATE_TOPICS: 'admin:1:1,users:1:1,projects:1:1,vim_account:1:1,wim_account:1:1,sdn:1:1,k8scluster:1:1,k8srepo:1:1,osmrepos:1:1,vnfd:1:1,nsd:1:1,nst:1:1,pdu:1:1,ns:1:1,nsi:1:1,alarm_request:1:1,alarm_response:1:1'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     healthcheck:
-      test: zookeeper-shell.sh zookeeper:2181 ls /brokers/ids 2>&1 | grep "Node does not exist" && exit 1 || exit 0
+      test: echo ruok | nc -w 2 zookeeper 2181
       interval: 20s
       timeout: 10s
       retries: 5
@@ -120,7 +118,7 @@ services:
     networks:
       - netOSM
   keystone:
-    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-7}
+    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-9}
     networks:
       - netOSM
     environment:
@@ -135,7 +133,7 @@ services:
         max-size: "100m"
         max-file: "2"
   nbi:
-    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-7}
+    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-9}
     networks:
       - netOSM
     volumes:
@@ -156,13 +154,14 @@ services:
     #  - kafka
     #  - mongo
   lcm:
-    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-7}
+    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-9}
     networks:
       - netOSM
     volumes:
       - osm_packages:/app/storage
     environment:
       OSMLCM_RO_HOST: ro
+      OSMLCM_RO_PORT: "9090"
       OSMLCM_DATABASE_HOST: mongo
       OSMLCM_MESSAGE_HOST: kafka
     env_file:
@@ -194,17 +193,18 @@ services:
 #    ports:
 #      - "3306:3306"
   ro:
-    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-7}
+    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-9}
     networks:
       - netOSM
     environment:
       RO_DB_HOST: mysql
+      OSMRO_DATABASE_HOST: mongo
+      OSMRO_MESSAGE_HOST: kafka
     env_file:
       - ./ro.env
     #depends_on:
-    #  - mysql
-    volumes:
-      - ro:/var/log/osm
+    #  - mongo
+    #  - kafka
     ports:
       - "${OSM_RO_PORTS:-9090:9090}"
     logging:
@@ -213,7 +213,7 @@ services:
         max-size: "100m"
         max-file: "2"
   mon:
-    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-7}
+    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-9}
     networks:
       - netOSM
     volumes:
@@ -233,7 +233,7 @@ services:
             max-file: 5
             max-size: 10m
   pol:
-    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-7}
+    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-9}
     networks:
       - netOSM
     volumes:
@@ -251,23 +251,6 @@ services:
       options:
         max-file: 5
         max-size: 10m
-  light-ui:
-    image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-7}
-    networks:
-      - netOSM
-    environment:
-      OSM_SERVER: nbi
-    #depends_on:
-    #  - nbi
-    env_file:
-      - ./lwui.env
-    ports:
-      - "${OSM_UI_PORTS:-80:80}"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "2"
   grafana:
     image: grafana/grafana
     volumes: