summaryrefslogtreecommitdiffstats
path: root/controlloop/common/feature-controlloop-casablanca/src
diff options
context:
space:
mode:
authorJorge Hernandez <jorge.hernandez-herrero@att.com>2019-03-01 00:30:27 -0600
committerJorge Hernandez <jorge.hernandez-herrero@att.com>2019-03-01 00:30:27 -0600
commitb19a5e9d4da4290faa2769f9d6b36e92556b0a57 (patch)
tree02b6fd00f0d12ee725bf9792bffab87fc8710c60 /controlloop/common/feature-controlloop-casablanca/src
parentd01dd35e38462ad56a802b5bc3f2f9d64faa0b92 (diff)
Replace hard install vars with environment vars
Change-Id: Iabff9e820e733a3e9f54018040f87a542a187de3 Issue-ID: POLICY-1543 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Diffstat (limited to 'controlloop/common/feature-controlloop-casablanca/src')
-rw-r--r--controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties56
1 files changed, 20 insertions, 36 deletions
diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
index 4f064c2ba..08482e001 100644
--- a/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
+++ b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
@@ -20,35 +20,29 @@
controller.name=casablanca
-dmaap.source.topics=${{PDPD_CONFIGURATION_TOPIC}},${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP
+dmaap.source.topics=${env:PDPD_CONFIGURATION_TOPIC},${env:DCAE_TOPIC},APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP
-dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${{PDPD_CONFIGURATION_SERVERS}}
-dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=
-dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=
-dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events=org.onap.policy.controlloop.params.ControlLoopParams
-dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=[?($.closedLoopControlName =~ /.*/ && $.controlLoopYaml =~ /.*/)]
-dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.https=true
+dmaap.source.topics.PDPD-CONFIGURATION.effectiveTopic=${env:PDPD_CONFIGURATION_TOPIC}
+dmaap.source.topics.PDPD-CONFIGURATION.servers=${env:PDPD_CONFIGURATION_SERVERS}
+dmaap.source.topics.PDPD-CONFIGURATION.events=org.onap.policy.controlloop.params.ControlLoopParams
+dmaap.source.topics.PDPD-CONFIGURATION.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=[?($.closedLoopControlName =~ /.*/ && $.controlLoopYaml =~ /.*/)]
+dmaap.source.topics.PDPD-CONFIGURATION.https=true
-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.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
@@ -56,23 +50,17 @@ dmaap.source.topics.APPC-LCM-WRITE.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
@@ -81,16 +69,12 @@ rules.groupId=${project.groupId}
rules.artifactId=controller-casablanca
rules.version=${project.version}
-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
-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