summaryrefslogtreecommitdiffstats
path: root/controlloop/packages/basex/src/files/config
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2017-08-17 14:46:36 -0500
committerJorge Hernandez <jh1730@att.com>2017-08-17 14:46:36 -0500
commit05aceee2186ee6cf05f6963e2435f8b44b389e62 (patch)
tree415c8f781a12bec92a997df435fe24acf9c24d7e /controlloop/packages/basex/src/files/config
parent6208027ab7345d8a65003928ab2e614e4fd285b8 (diff)
installation improvements and renaming archetype
Two changes: - remove hardcoding of the DMaaP hosts, and DCAE topic to make it configurable. - rename archetype to better name. Change-Id: Ic50b9d1f06a138230c76cc6c50ca8072dc5da148 Issue-ID: POLICY-159 Signed-off-by: Jorge Hernandez <jh1730@att.com>
Diffstat (limited to 'controlloop/packages/basex/src/files/config')
-rw-r--r--controlloop/packages/basex/src/files/config/vDNS-controller.properties20
-rw-r--r--controlloop/packages/basex/src/files/config/vFW-controller.properties20
2 files changed, 20 insertions, 20 deletions
diff --git a/controlloop/packages/basex/src/files/config/vDNS-controller.properties b/controlloop/packages/basex/src/files/config/vDNS-controller.properties
index 7da128f29..8f1371dc5 100644
--- a/controlloop/packages/basex/src/files/config/vDNS-controller.properties
+++ b/controlloop/packages/basex/src/files/config/vDNS-controller.properties
@@ -20,16 +20,16 @@
controller.name=vDNS
-ueb.source.topics=DCAE-CL-EVENT,APPC-CL
+ueb.source.topics=${{DCAE_TOPIC}},APPC-CL
-ueb.source.topics.DCAE-CL-EVENT.servers=vm1.mr.simpledemo.openecomp.org
-ueb.source.topics.DCAE-CL-EVENT.apiKey=
-ueb.source.topics.DCAE-CL-EVENT.apiSecret=
-ueb.source.topics.DCAE-CL-EVENT.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-ueb.source.topics.DCAE-CL-EVENT.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*DNS.*
-ueb.source.topics.DCAE-CL-EVENT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+ueb.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
+ueb.source.topics.${{DCAE_TOPIC}}.apiKey=
+ueb.source.topics.${{DCAE_TOPIC}}.apiSecret=
+ueb.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
+ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*DNS.*
+ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
-ueb.source.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org
+ueb.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
ueb.source.topics.APPC-CL.apiKey=
ueb.source.topics.APPC-CL.apiSecret=
ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response
@@ -38,13 +38,13 @@ ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serializa
ueb.sink.topics=APPC-CL,POLICY-CL-MGT
-ueb.sink.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org
+ueb.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
ueb.sink.topics.APPC-CL.apiKey=
ueb.sink.topics.APPC-CL.apiSecret=
ueb.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
-ueb.sink.topics.POLICY-CL-MGT.servers=vm1.mr.simpledemo.openecomp.org
+ueb.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
ueb.sink.topics.POLICY-CL-MGT.apiKey=
ueb.sink.topics.POLICY-CL-MGT.apiSecret=
ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
diff --git a/controlloop/packages/basex/src/files/config/vFW-controller.properties b/controlloop/packages/basex/src/files/config/vFW-controller.properties
index 8b8587504..10a0bf474 100644
--- a/controlloop/packages/basex/src/files/config/vFW-controller.properties
+++ b/controlloop/packages/basex/src/files/config/vFW-controller.properties
@@ -20,16 +20,16 @@
controller.name=vFW
-ueb.source.topics=DCAE-CL-EVENT,APPC-CL
+ueb.source.topics=${{DCAE_TOPIC}},APPC-CL
-ueb.source.topics.DCAE-CL-EVENT.servers=vm1.mr.simpledemo.openecomp.org
-ueb.source.topics.DCAE-CL-EVENT.apiKey=
-ueb.source.topics.DCAE-CL-EVENT.apiSecret=
-ueb.source.topics.DCAE-CL-EVENT.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-ueb.source.topics.DCAE-CL-EVENT.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*FRWL.*
-ueb.source.topics.DCAE-CL-EVENT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+ueb.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
+ueb.source.topics.${{DCAE_TOPIC}}.apiKey=
+ueb.source.topics.${{DCAE_TOPIC}}.apiSecret=
+ueb.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
+ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*FRWL.*
+ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
-ueb.source.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org
+ueb.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
ueb.source.topics.APPC-CL.apiKey=
ueb.source.topics.APPC-CL.apiSecret=
ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response
@@ -38,13 +38,13 @@ ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serializa
ueb.sink.topics=APPC-CL,POLICY-CL-MGT
-ueb.sink.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org
+ueb.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
ueb.sink.topics.APPC-CL.apiKey=
ueb.sink.topics.APPC-CL.apiSecret=
ueb.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
-ueb.sink.topics.POLICY-CL-MGT.servers=vm1.mr.simpledemo.openecomp.org
+ueb.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
ueb.sink.topics.POLICY-CL-MGT.apiKey=
ueb.sink.topics.POLICY-CL-MGT.apiSecret=
ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification