update default configuration for heat deploy

Change-Id: I0ca2db24c757a5a8372e83ba1b7dbf5eb67b7d69
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-434

diff --git a/heat/R2MVP/docker-compose-2.yaml b/heat/R2MVP/docker-compose-2.yaml
index 57bdd3f..707cc54 100644 (file)
--- a/heat/R2MVP/docker-compose-2.yaml
+++ b/heat/R2MVP/docker-compose-2.yaml
@@ -22,7 +22,7 @@ services:
       environment:
        - DMAAPHOST={{ mr_ip_addr }}
        - DMAAPPORT=3904
-       - DMAAPPUBTOPIC=unauthenticated.TCA_EVENT_OUTPUT
+       - DMAAPPUBTOPIC=unauthenticated.DCAE_CL_OUTPUT
        - DMAAPSUBTOPIC=unauthenticated.SEC_MEASUREMENT_OUTPUT
        - AAIHOST={{ aai1_ip_addr }}
        - AAIPORT=8443
@@ -31,6 +31,7 @@ services:
        - CBS_HOST=cbs
        - CBS_PORT=10000
        - SERVICE_NAME=tca
+       - HOSTNAME=tca
        - CONFIG_BINDING_SERVICE=config_binding_service
        # set the parameter below to enable REDIS caching. 
        #- REDISHOSTPORT=redis-cluster:6379

diff --git a/tca-cdap-container/restart.sh b/tca-cdap-container/restart.sh
index 95a41d2..32c920e 100755 (executable)
--- a/tca-cdap-container/restart.sh
+++ b/tca-cdap-container/restart.sh
@@ -48,7 +48,8 @@ CBS_PORT=$(curl -s "${CONSUL_HOST}:${CONSUL_PORT}/v1/catalog/service/${CBS_SERVI
 CBS_HOST=${CBS_HOST:-config_binding_service}
 CBS_PORT=${CBS_PORT:-10000}
 
-MY_NAME=${SERVICE_NAME:-tca}
+#Changing to HOSTNAME parameter for consistency with k8s deploy
+MY_NAME=${HOSTNAME:-tca}
 
 echo "TCA environment: I am ${MY_NAME}, consul at ${CONSUL_HOST}:${CONSUL_PORT}, CBS at ${CBS_HOST}:${CBS_PORT}, service name ${CBS_SERVICE_NAME}"
 
@@ -141,7 +142,7 @@ function tca_status {
 
 
 function tca_poll_policy {
-    MY_NAME=${SERVICE_NAME:-tca}
+    MY_NAME=${HOSTNAME:-tca}
 
     URL1="${CBS_HOST}:${CBS_PORT}/service_component/${MY_NAME}"
     URL2="$URL1:preferences"

diff --git a/tca-cdap-container/tca_app_preferences.json b/tca-cdap-container/tca_app_preferences.json
index 76fa8c2..a2c3bf7 100644 (file)
--- a/tca-cdap-container/tca_app_preferences.json
+++ b/tca-cdap-container/tca_app_preferences.json
@@ -7,7 +7,7 @@
   "aaiEnrichmentUserPassword": "DCAE",
   "aaiVMEnrichmentAPIPath": "/aai/v11/search/nodes-query",
   "aaiVNFEnrichmentAPIPath": "/aai/v11/network/generic-vnfs/generic-vnf",
-  "enableAAIEnrichment": "false",
+  "enableAAIEnrichment": "true",
   "enableAlertCEFFormat": "false",
   "enableRedisCaching": "{{REDISCACHING}}",
   "redisHosts": "{{REDISHOSTPORT}}",