From e05a96429ac2d4823011c9dc70accdd0f581b862 Mon Sep 17 00:00:00 2001 From: jhh Date: Tue, 13 Apr 2021 17:27:35 -0500 Subject: Add legacy-config new feature This feature makes the legacy configuration optional. It was used by brmsgw and other tooling to provision via its DMaaP channel. The capability to configure via PdpConfiguration object is kept in the core preserving backwards compatibility, but the DMaaP provisioning channel(s) are optional. Issue-ID: POLICY-2618 Signed-off-by: jhh Change-Id: Ia7198ac3b2810d85133c06ba5217a9c28e07ac4c Signed-off-by: jhh --- .../src/main/server/config/engine.properties | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'policy-management') diff --git a/policy-management/src/main/server/config/engine.properties b/policy-management/src/main/server/config/engine.properties index 4f114d88..de93b97e 100644 --- a/policy-management/src/main/server/config/engine.properties +++ b/policy-management/src/main/server/config/engine.properties @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,18 +18,7 @@ # ============LICENSE_END========================================================= ### -# Policy Engine Configuration Channels - -dmaap.source.topics=PDPD-CONFIGURATION - -dmaap.source.topics.PDPD-CONFIGURATION.servers=${envd:DMAAP_SERVERS} -dmaap.source.topics.PDPD-CONFIGURATION.effectiveTopic=${envd:PDPD_CONFIGURATION_TOPIC} -dmaap.source.topics.PDPD-CONFIGURATION.apiKey=${envd:PDPD_CONFIGURATION_API_KEY} -dmaap.source.topics.PDPD-CONFIGURATION.apiSecret=${envd:PDPD_CONFIGURATION_API_SECRET} -dmaap.source.topics.PDPD-CONFIGURATION.consumerGroup=${envd:PDPD_CONFIGURATION_CONSUMER_GROUP} -dmaap.source.topics.PDPD-CONFIGURATION.consumerInstance=${envd:PDPD_CONFIGURATION_CONSUMER_INSTANCE} -dmaap.source.topics.PDPD-CONFIGURATION.managed=false -dmaap.source.topics.PDPD-CONFIGURATION.https=true +# Policy Engine Telemetry Server http.server.services=SECURED-CONFIG @@ -46,4 +35,3 @@ http.server.services.SECURED-CONFIG.serialization.provider=org.onap.policy.commo aaf.namespace=${envd:AAF_NAMESPACE:false} aaf.root.permission=${envd:AAF_NAMESPACE:org.onap.policy}.pdpd - -- cgit 1.2.3-korg