diff options
| author |   Lusheng Ji <lji@research.att.com> | 2018-04-16 21:27:17 -0400 |
|---|---|---|
| committer | Lusheng Ji <lji@research.att.com> | 2018-04-17 13:14:31 +0000 |
| commit | bd838e7a4830217d3d0483067671dcb03965ece3 (patch) | |
| tree | ae468f3ea51e25c50bde9d3678ed08d19b26eb99 /heat/docker-compose-4.yaml | |
| parent | b16d16eca45530ba1c4e63ca9e14277dd5649251 (diff) | |
Fix docker script as healthcheck etc
1. fix docker script as healthcheck for service change handler
2. improve docker compose blocks for stretch goal container
3. fix instaling plugins to cloudify manager
4. add one more plugin to build/upload: dockerplugin.
Issue-ID: DCAEGEN2-434
Change-Id: I997d8564fe0ee0cf5a013b042eb6c0e9fb331276
Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'heat/docker-compose-4.yaml')
| -rw-r--r-- | heat/docker-compose-4.yaml | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/heat/docker-compose-4.yaml b/heat/docker-compose-4.yaml index f132ea9..0bfa0e5 100644 --- a/heat/docker-compose-4.yaml +++ b/heat/docker-compose-4.yaml @@ -2,19 +2,22 @@ version: '2.1' services: heartbeat: image: "{{ nexus_docker_repo}}/onap/org.onap.dcaegen2.platform.heartbeat:{{ dcae_docker_heartbeat }}" - - #image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.heartbeat:latest - container_name: heartbeat - hostname: heartbeat + container_name: static-dcaegen2-services-heartbeat + hostname: static-dcaegen2-services-heartbeat environment: - - CONSUL_HOST=consul - - CONSUL_PORT=8500 - - HOSTNAME= + - "DMAAPHOST={{ mr_ip_addr }}" + - "CONSUL_HOST=consul" + - "CONSUL_PORT=8500" + - "CONFIG_BINDING_SERVICE=config_binding_service" + - "SERVICE_NAME=static-dcaegen2-services-heartbeat" + - "HOSTNAME=static-dcaegen2-services-heartbeat" ports: - - "1003:1003" + - "10001:10000" labels: - - SERVICE_NAME=static-dcaegen2-services-heartbeat - - SERVICE_CHECK_INITIAL_STATUS=passing + - "SERVICE_NAME=static-dcaegen2-services-heartbeat" + - "SERVICE_CHECK_DOCKER_SCRIPT=/app/bin/check_health.py" + - "SERVICE_CHECK_INTERVAL=15s" + - "SERVICE_CHECK_INITIAL_STATUS=passing" prh: @@ -22,28 +25,35 @@ services: container_name: prh hostname: prh environment: - - CONSUL_HOST=consul - - CONSUL_PORT=8500 - - HOSTNAME= + - "DMAAPHOST={{ mr_ip_addr }}" + - "CONSUL_HOST=consul" + - "CONSUL_PORT=8500" + - "CONFIG_BINDING_SERVICE=config_binding_service" + - "SERVICE_NAME=static-dcaegen2-services-prh" + - "HOSTNAME=static-dcaegen2-services-prh" ports: - - "1002:1002" + - "8100:8100" labels: - - SERVICE_NAME=static-dcaegen2-services-prh-prh-app-server - - SERVICE_CHECK_INITIAL_STATUS=passing + - "SERVICE_8100_NAME=static-dcaegen2-services-prh" + - "SERVICE_8100_CHECK_TCP=true" + - "SERVICE_8100_CHECK_INTERVAL=15s" + - "SERVICE_8100_CHECK_INITIAL_STATUS=passing" snmptrap: - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.snmptrap:latest image: "{{ nexus_docker_repo}}/onap/org.onap.dcaegen2.collectors.snmptrap:{{ dcae_docker_snmptrap }}" - container_name: snmptrap - hostname: snmptrap + container_name: static-dcaegen2-collectors-snmptrap + hostname: static-dcaegen2-collectors-snmptrap environment: - - CONSUL_HOST=consul - - CONSUL_PORT=8500 - - HOSTNAME= + - "DMAAPHOST={{ mr_ip_addr }}" + - "CONSUL_HOST=consul" + - "CONSUL_PORT=8500" + - "CONFIG_BINDING_SERVICE=config_binding_service" + - "SERVICE_NAME=static-dcaegen2-collectors-snmptrap" + - "HOSTNAME=static-dcaegen2-collectors-snmptrap" ports: - "162:162/udp" labels: - - SERVICE_NAME=static-dcaegen2-collectors-snamptrap + - SERVICE_NAME=static-dcaegen2-collectors-snmptrap - SERVICE_CHECK_INITIAL_STATUS=passing |