From 6fabd804de890bc5069d2518fffb11b83ea5961a Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Wed, 4 Apr 2018 16:51:35 -0400 Subject: Fix docker-compose files Alos breaking into two files so we can use shell script to check for dependencies, as well as injecting KVs before service components are up. Issue-ID: DCAEGEN2-206 Change-Id: I8a14675ab96472f2eda86864b5e3248bd48dd00d Signed-off-by: Lusheng Ji --- heat/R2MVP/docker-compose-1.yaml | 33 +++++++++++++++ heat/R2MVP/docker-compose-2.yaml | 62 +++++++++++++++++++++++++++ heat/R2MVP/docker-compose.yaml | 91 ---------------------------------------- 3 files changed, 95 insertions(+), 91 deletions(-) create mode 100644 heat/R2MVP/docker-compose-1.yaml create mode 100644 heat/R2MVP/docker-compose-2.yaml delete mode 100644 heat/R2MVP/docker-compose.yaml diff --git a/heat/R2MVP/docker-compose-1.yaml b/heat/R2MVP/docker-compose-1.yaml new file mode 100644 index 0000000..6d5ed67 --- /dev/null +++ b/heat/R2MVP/docker-compose-1.yaml @@ -0,0 +1,33 @@ +version: '2.1' +services: + db: + image: postgres:9.5 + container_name: "db" + hostname: "db" + ports: + - "5432:5432" + environment: + - POSTGRES_USER=holmes + - POSTGRES_PASSWORD=holmespwd + + consul: + image: consul:0.8.3 + container_name: "consul" + hostname: "consul" + ports: + - "8400:8400" + - "8500:8500" + - "8600:8600" + command: "agent -server -bootstrap-expect 1 -client 0.0.0.0" + + config_binding_service: + image: {{ nexus_docker_repo }}/onap/org.onap.dcaegen2.platform.configbinding:v1.2.0 + container_name: "config_binding_service" + hostname: "config_binding_service" + environment: + - CONSUL_HOST="consul" + ports: + - "10000:10000" + depends_on: + - consul + diff --git a/heat/R2MVP/docker-compose-2.yaml b/heat/R2MVP/docker-compose-2.yaml new file mode 100644 index 0000000..c77cbf0 --- /dev/null +++ b/heat/R2MVP/docker-compose-2.yaml @@ -0,0 +1,62 @@ +version: '2.1' +services: + ves: + image: {{ nexus_docker_repo }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.2.0 + container_name: "ves" + hostname: "ves" + environment: + - DMAAPHOST={{ mr_ip_addr }} + - CONSUL_HOST=consul + - CONSUL_PORT=8500 + - CONFIG_BINDING_SERVICE=config_binding_service + - SERVICE_NAME=ves + - HOSTNAME=ves + ports: + - "8080:8080" + - "8443:8443" + + tca: + image: {{ nexus_docker_repo }}/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.0.0 + container_name: tca + hostname: tca + environment: + - DMAAPHOST={{ mr_ip_addr }} + - CONSUL_HOST=consul + - CONSUL_PORT=8500 + - CBS_HOST=cbs + - CBS_PORT=10000 + - SERVICE_NAME=tca + - CONFIG_BINDING_SERVICE=config_binding_service + ports: + - "11011:11011" + - "11015:11015" + + holmes-engine: + image: {{ nexus_docker_repo }}/onap/holmes/engine-management:latest + container_name: he + hostname: he + environment: + - URL_JDBC=db:5432 + - JDBC_USERNAME=holmes + - JDBC_PASSWORD=holmespwd + - MSB_ADDR={{ msb_ip_addr }} + - CONSUL_HOST=consul + - CONSUL_PORT=8500 + - HOSTNAME=he + ports: + - "9102:9102" + + holmes-rule: + image: {{ nexus_docker_repo }}/onap/holmes/rule-management:latest + container_name: hr + hostname: hr + environment: + - URL_JDBC=db:5432 + - JDBC_USERNAME=holmes + - JDBC_PASSWORD=holmespwd + - MSB_ADDR={{ msb_ip_addr }} + - CONSUL_HOST=consul + - CONSUL_PORT=8500 + - HOSTNAME=hr + ports: + - "9101:9101" diff --git a/heat/R2MVP/docker-compose.yaml b/heat/R2MVP/docker-compose.yaml deleted file mode 100644 index 5413a5d..0000000 --- a/heat/R2MVP/docker-compose.yaml +++ /dev/null @@ -1,91 +0,0 @@ -version: '2' -services: - db: - image: postgres:9.5 - container_name: "db" - hostname: "db" - ports: - - "5432:5432" - environment: - POSTGRES_USER: "holmes" - POSTGRES_PASSWORD: "holmespwd" - - consul: - image: consul:0.8.3 - container_name: "consul" - hostname: "consul" - ports: - - "8400:8400" - - "8500:8500" - - "8600:8600" - command: "-server -bootstrap-expect 1" - - config_binding_service: - image: {{ nexus_docker_repo }}/onap/org.onap.dcaegen2.platform.configbinding:v1.2.0 - container_name: "config_binding_service" - hostname: "config_binding_service" - environment: - - CONSUL_HOST: consul - expose: - - "10000:10000" - - ves: - image: {{ nexus_docker_repo }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.2.0 - container_name: "ves" - hostname: "ves" - environment: - - DMAAPHOST={{ mr_ip_addr }} - - CONSUL_HOST=consul - - CONSUL_PORT=8500 - - CONFIG_BINDING_SERVICE=config_binding_service - - SERVICE_NAME=ves - - HOSTNAME=ves - expose: - - "8080:8080" - - "8443:8443" - - tca: - image: {{ nexus_docker_repo }}/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.0.0 - container_name: tca - hostname: tca - environment: - - DMAAPHOST={{ mr_ip_addr }} - - CONSUL_HOST=consul - - CONSUL_PORT=8500 - - CBS_HOST=cbs - - CBS_PORT=10000 - - SERVICE_NAME=tca - - CONFIG_BINDING_SERVICE=config_binding_service - expose: - - "11011:11011" - - "11015:11015" - - holmes-engine: - image: {{ nexus_docker_repo }}/onap/holmes/engine-management:latest - conatiner_name: he - host_name: he - environment: - - URL_JDBC=db:5432 - - JDBC_USERNAME=holmes - - JDBC_PASSWORD=holmespwd - - MSB_ADDR={{ msb_ip_addr }} - - CONSUL_HOST=consul - - CONSUL_PORT=8500 - - HOSTNAME=he - expose: - - "9102:9102" - - holmes-rule: - image: {{ nexus_docker_repo }}/onap/holmes/rule-management:latest - conatiner_name: hr - host_name: hr - environment: - - URL_JDBC=db:5432 - - JDBC_USERNAME=holmes - - JDBC_PASSWORD=holmespwd - - MSB_ADDR={{ msb_ip_addr }} - - CONSUL_HOST=consul - - CONSUL_PORT=8500 - - HOSTNAME=hr - expose: - - "9101:9101" -- cgit 1.2.3-korg