Replace hard install vars with environment vars

Change-Id: Iabff9e820e733a3e9f54018040f87a542a187de3
Issue-ID: POLICY-1543
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>

3 files changed, 63 insertions, 94 deletions

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
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
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
index 2b63d51ad..e87df42c3 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
@@ -22,33 +22,33 @@
 # directory, it will be automatically loaded by PDP-D, after being expanded
 # by installation scripts.
 
-sql.db.host=${{SQL_HOST}}
-sql.db.username=${{SQL_USER}}
-sql.db.password=${{SQL_PASSWORD}}
-
-aai.url=${{AAI_URL}}
-aai.username=${{AAI_USERNAME}}
-aai.password=${{AAI_PASSWORD}}
-
-so.url=${{SO_URL}}
-so.username=${{SO_USERNAME}}
-so.password=${{SO_PASSWORD}}
-
-vfc.url=${{VFC_URL}}
-vfc.username=${{VFC_USERNAME}}
-vfc.password=${{VFC_PASSWORD}}
-
-pdpx.host=${{PDP_HOST}}
-pdpx.username=${{PDP_USERNAME}}
-pdpx.password=${{PDP_PASSWORD}}
-pdpx.environment=${{PDP_ENVIRONMENT}}
-pdpx.client.username=${{PDP_CLIENT_USERNAME}}
-pdpx.client.password=${{PDP_CLIENT_PASSWORD}}
-
-guard.url=https://${{PDP_HOST}}:8081/pdp/api/getDecision
-guard.jdbc.url=jdbc:mariadb://${{SQL_HOST}}:3306/onap_sdk
+sql.db.host=${env:SQL_HOST}
+sql.db.username=${env:SQL_USER}
+sql.db.password=${env:SQL_PASSWORD}
+
+aai.url=${env:AAI_URL}
+aai.username=${env:AAI_USERNAME}
+aai.password=${env:AAI_PASSWORD}
+
+so.url=${env:SO_URL}
+so.username=${env:SO_USERNAME}
+so.password=${env:SO_PASSWORD}
+
+vfc.url=${env:VFC_URL}
+vfc.username=${env:VFC_USERNAME}
+vfc.password=${env:VFC_PASSWORD}
+
+pdpx.host=${env:PDP_HOST}
+pdpx.username=${env:PDP_USERNAME}
+pdpx.password=${env:PDP_PASSWORD}
+pdpx.environment=${env:PDP_ENVIRONMENT}
+pdpx.client.username=${env:PDP_CLIENT_USERNAME}
+pdpx.client.password=${env:PDP_CLIENT_PASSWORD}
+
+guard.url=https://${env:PDP_HOST}:8081/pdp/api/getDecision
+guard.jdbc.url=jdbc:mariadb://${env:SQL_HOST}:3306/onap_sdk
 guard.disabled=false
 
-sdnc.url=${{SDNC_URL}}
-sdnc.username=${{SDNC_USERNAME}}
-sdnc.password=${{SDNC_PASSWORD}}
+sdnc.url=${env:SDNC_URL}
+sdnc.username=${env:SDNC_USERNAME}
+sdnc.password=${env:SDNC_PASSWORD}