From b19a5e9d4da4290faa2769f9d6b36e92556b0a57 Mon Sep 17 00:00:00 2001
From: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Date: Fri, 1 Mar 2019 00:30:27 -0600
Subject: Replace hard install vars with environment vars

Change-Id: Iabff9e820e733a3e9f54018040f87a542a187de3
Issue-ID: POLICY-1543
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
---
 .../feature/config/amsterdam-controller.properties | 45 ++++++++--------------
 1 file changed, 15 insertions(+), 30 deletions(-)

(limited to 'controlloop/common/feature-controlloop-amsterdam/src')

diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
index dd2bd86e4..b52b1f4eb 100644
--- a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
+++ b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
@@ -20,36 +20,29 @@
 
 controller.name=amsterdam
 
-dmaap.source.topics=${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP
+dmaap.source.topics=DCAE_TOPIC,APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP
 
-dmaap.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
-dmaap.source.topics.${{DCAE_TOPIC}}.apiKey=
-dmaap.source.topics.${{DCAE_TOPIC}}.apiSecret=
-dmaap.source.topics.${{DCAE_TOPIC}}.consumerGroup=${{DCAE_CONSUMER_GROUP}}
-dmaap.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-dmaap.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)]
-dmaap.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
-dmaap.source.topics.${{DCAE_TOPIC}}.https=true
+dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC}
+dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS}
+dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP}
+dmaap.source.topics.DCAE_TOPIC.events=org.onap.policy.controlloop.VirtualControlLoopEvent
+dmaap.source.topics.DCAE_TOPIC.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)]
+dmaap.source.topics.DCAE_TOPIC.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
+dmaap.source.topics.DCAE_TOPIC.https=true
 
-dmaap.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
-dmaap.source.topics.APPC-CL.apiKey=
-dmaap.source.topics.APPC-CL.apiSecret=
+dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS}
 dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response
 dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)]
 dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
 dmaap.source.topics.APPC-CL.servers.https=true
 
-dmaap.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}}
-dmaap.source.topics.APPC-LCM-WRITE.apiKey=
-dmaap.source.topics.APPC-LCM-WRITE.apiSecret=
+dmaap.source.topics.APPC-LCM-WRITE.servers=${env:DMAAP_SERVERS}
 dmaap.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper
 dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=[?($.type == 'response')]
 dmaap.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
 dmaap.source.topics.APPC-LCM-WRITE.https=true
 
-dmaap.source.topics.SDNR-CL-RSP.servers=${{DMAAP_SERVERS}}
-dmaap.source.topics.SDNR-CL-RSP.apiKey=
-dmaap.source.topics.SDNR-CL-RSP.apiSecret=
+dmaap.source.topics.SDNR-CL-RSP.servers=${env:DMAAP_SERVERS}
 dmaap.source.topics.SDNR-CL-RSP.events=org.onap.policy.sdnr.PciResponseWrapper
 dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=[?($.type == 'response')]
 dmaap.source.topics.SDNR-CL-RSP.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson
@@ -57,30 +50,22 @@ dmaap.source.topics.SDNR-CL-RSP.https=true
 
 dmaap.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL
 
-dmaap.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
-dmaap.sink.topics.APPC-CL.apiKey=
-dmaap.sink.topics.APPC-CL.apiSecret=
+dmaap.sink.topics.APPC-CL.servers=${env:DMAAP_SERVERS}
 dmaap.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
 dmaap.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
 dmaap.sink.topics.APPC-CL.https=true
 
-dmaap.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}}
-dmaap.sink.topics.APPC-LCM-READ.apiKey=
-dmaap.sink.topics.APPC-LCM-READ.apiSecret=
+dmaap.sink.topics.APPC-LCM-READ.servers=${env:DMAAP_SERVERS}
 dmaap.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LcmRequestWrapper
 dmaap.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
 dmaap.sink.topics.APPC-LCM-READ.https=true
 
-dmaap.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
-dmaap.sink.topics.POLICY-CL-MGT.apiKey=
-dmaap.sink.topics.POLICY-CL-MGT.apiSecret=
+dmaap.sink.topics.POLICY-CL-MGT.servers=${env:DMAAP_SERVERS}
 dmaap.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
 dmaap.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
 dmaap.sink.topics.POLICY-CL-MGT.https=true
 
-dmaap.sink.topics.SDNR-CL.servers=${{DMAAP_SERVERS}}
-dmaap.sink.topics.SDNR-CL.apiKey=
-dmaap.sink.topics.SDNR-CL.apiSecret=
+dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS}
 dmaap.sink.topics.SDNR-CL.events=org.onap.policy.sdnr.PciRequestWrapper
 dmaap.sink.topics.SDNR-CL.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson
 dmaap.sink.topics.SDNR-CL.https=true
-- 
cgit 1.2.3-korg