From 9e77037eb13279a69a38dd78f400365f16e220c1 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 9 May 2018 09:14:08 -0400 Subject: Change pooling property name Removed "AMSTERDAM_" prefix from pooling topic property name. Added feature-specific conf file with pooling topic property. Enabled distributed locking DB properties. Change distributed locking DB name to "pooling" to match the code. Add default value to feature-specific conf file. Change "_" in default topic name to "-". Change-Id: I53de51787694e5920dc9ced07b5a9ac60bb63e45 Issue-ID: POLICY-782 Signed-off-by: Jim Hahn --- .../config/feature-pooling-dmaap.properties | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'feature-pooling-dmaap/src') diff --git a/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties b/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties index 3e582370..9f8c804b 100644 --- a/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties +++ b/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties @@ -71,17 +71,26 @@ extractor.requestId.org.onap.policy.controlloop.VirtualControlLoopEvent=${requestId} +# Each controller that is enabled should have its own topic and the +# corresponding ueb.xxx properties. However, for now, just assume that +# the amsterdam-cl and beijing-cl features will not both be enabled +# at the same time. + pooling.amsterdam.enabled=true -pooling.amsterdam.topic=${{AMSTERDAM_POOLING_TOPIC}} +pooling.amsterdam.topic=${{POOLING_TOPIC}} + +pooling.beijing.enabled=true +pooling.beijing.topic=${{POOLING_TOPIC}} + # the list of sources and sinks should be identical -ueb.source.topics=${{AMSTERDAM_POOLING_TOPIC}} -ueb.sink.topics=${{AMSTERDAM_POOLING_TOPIC}} +ueb.source.topics=${{POOLING_TOPIC}} +ueb.sink.topics=${{POOLING_TOPIC}} -ueb.source.topics.${{AMSTERDAM_POOLING_TOPIC}}.servers=${{DMAAP_SERVERS}} -ueb.source.topics.${{AMSTERDAM_POOLING_TOPIC}}.apiKey= -ueb.source.topics.${{AMSTERDAM_POOLING_TOPIC}}.apiSecret= +ueb.source.topics.${{POOLING_TOPIC}}.servers=${{DMAAP_SERVERS}} +ueb.source.topics.${{POOLING_TOPIC}}.apiKey= +ueb.source.topics.${{POOLING_TOPIC}}.apiSecret= -ueb.sink.topics.${{AMSTERDAM_POOLING_TOPIC}}.servers=${{DMAAP_SERVERS}} -ueb.sink.topics.${{AMSTERDAM_POOLING_TOPIC}}.apiKey= -ueb.sink.topics.${{AMSTERDAM_POOLING_TOPIC}}.apiSecret= +ueb.sink.topics.${{POOLING_TOPIC}}.servers=${{DMAAP_SERVERS}} +ueb.sink.topics.${{POOLING_TOPIC}}.apiKey= +ueb.sink.topics.${{POOLING_TOPIC}}.apiSecret= -- cgit 1.2.3-korg