X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fdocker%2Fdocker-compose.yaml;h=ea3661e487a0affdf212772fa101c5278aed25cb;hb=83ea27a120080d6b753d6ac8ad8410660e8822e8;hp=492036dc4f4894de0099b5a66d94d9ed294b853b;hpb=7cebea8dfc8d698581135f5b9ab234154a3b62a8;p=osm%2Fdevops.git diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml index 492036dc..ea3661e4 100644 --- a/installers/docker/docker-compose.yaml +++ b/installers/docker/docker-compose.yaml @@ -65,8 +65,6 @@ 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,pla:1:1' volumes: - /var/run/docker.sock:/var/run/docker.sock healthcheck: @@ -163,6 +161,7 @@ services: - osm_packages:/app/storage environment: OSMLCM_RO_HOST: ro + OSMLCM_RO_PORT: "9090" OSMLCM_DATABASE_HOST: mongo OSMLCM_MESSAGE_HOST: kafka env_file: @@ -199,12 +198,13 @@ services: - 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: @@ -251,23 +251,6 @@ services: options: max-file: 5 max-size: 10m - light-ui: - image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-8} - 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: