Clean out references to unrelease resources

Issue-ID: DCAEGEN2-1007
Change-Id: Ieabedb95e2e8595f722e1f6172382325973f8049
Signed-off-by: Lusheng Ji <lji@research.att.com>

diff --git a/heat/docker-compose-4.yaml b/heat/docker-compose-4.yaml
index 11272dd..46fbd87 100644 (file)
--- a/heat/docker-compose-4.yaml
+++ b/heat/docker-compose-4.yaml
@@ -93,67 +93,3 @@ services:
       volumes:
        - "./tls/shared:/opt/tls/shared"
 
-   mapper-universalvesadaptor:
-      image: "{{ nexus_docker_repo }}/onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:{{ dcae_docker_mua }}"
-      container_name: "static-dcaegen2-services-mua"
-      restart: "always"
-      hostname: "static-dcaegen2-services-mua"
-      environment:
-       - "DMAAPHOST={{ mr_ip_addr }}"
-       - "CONSUL_HOST=consul"
-       - "CONSUL_PORT=8500"
-       - "CONFIG_BINDING_SERVICE=config_binding_service"
-       - "SERVICE_NAME=static-dcaegen2-services-mua"
-       - "HOSTNAME=static-dcaegen2-services-mua"
-       - "HOSTALIASES=/etc/host.aliases"
-      labels:
-       - "SERVICE_NAME=static-dcaegen2-services-mua"
-       - "SERVICE_CHECK_DOCKER_SCRIPT=/opt/app/datafile/bin/healthcheck.sh"
-       - "SERVICE_CHECK_INTERVAL=15s"
-       - "SERVICE_CHECK_INITIAL_STATUS=passing"
-      volumes:
-       - "./tls/shared:/opt/tls/shared"
-
-   mapper-snmp:
-      image: "{{ nexus_docker_repo }}/onap/org.onap.dcaegen2.services.mapper.vesadapter.snmpmapper:{{ dcae_docker_msnmp }}"
-      container_name: "static-dcaegen2-services-msnmp"
-      restart: "always"
-      hostname: "static-dcaegen2-services-msnmp"
-      environment:
-       - "DMAAPHOST={{ mr_ip_addr }}"
-       - "CONSUL_HOST=consul"
-       - "CONSUL_PORT=8500"
-       - "CONFIG_BINDING_SERVICE=config_binding_service"
-       - "SERVICE_NAME=static-dcaegen2-services-msnmp"
-       - "HOSTNAME=static-dcaegen2-services-msnmp"
-       - "HOSTALIASES=/etc/host.aliases"
-      labels:
-       - "SERVICE_NAME=static-dcaegen2-services-msnmp"
-       - "SERVICE_CHECK_DOCKER_SCRIPT=/opt/app/datafile/bin/healthcheck.sh"
-       - "SERVICE_CHECK_INTERVAL=15s"
-       - "SERVICE_CHECK_INITIAL_STATUS=passing"
-      volumes:
-       - "./tls/shared:/opt/tls/shared"
-
-
-   heartbeat:
-      image: "{{ nexus_docker_repo }}/onap/org.onap.dcaegen2.services.heartbeat:{{ dcae_docker_heartbeat }}"
-      container_name: "static-dcaegen2-services-heartbeat"
-      restart: "always"
-      hostname: "static-dcaegen2-services-heartbeat"
-      environment:
-       - "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"
-       - "HOSTALIASES=/etc/host.aliases"
-      labels:
-       - "SERVICE_NAME=static-dcaegen2-services-heartbeat"
-       - "SERVICE_CHECK_DOCKER_SCRIPT=/opt/app/datafile/bin/healthcheck.sh"
-       - "SERVICE_CHECK_INTERVAL=15s"      
-       - "SERVICE_CHECK_INITIAL_STATUS=passing"
-      volumes:
-       - "./tls/shared:/opt/tls/shared"
-

diff --git a/heat/register.sh b/heat/register.sh
index c48d8b7..62ef091 100755 (executable)
--- a/heat/register.sh
+++ b/heat/register.sh
@@ -533,7 +533,7 @@ SERVICENAME="${SRVCNAME_STATIC_DFC}"
   "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
   "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
   "dmaap.dmaapConsumerConfiguration.messageLimit": 1,
-  "dmaap.dmaapProducerConfiguration.dmaapHostName": "{{ dr_ip_addr }}",
+  "dmaap.dmaapProducerConfiguration.dmaapHostName": "{{ mr_ip_addr }}",
   "dmaap.dmaapProducerConfiguration.dmaapPortNumber": 3907,
   "dmaap.dmaapProducerConfiguration.dmaapTopicName": "publish",
   "dmaap.dmaapProducerConfiguration.dmaapProtocol": "https",