diff options
Diffstat (limited to 'compose/config')
4 files changed, 15 insertions, 7 deletions
diff --git a/compose/config/drools-applications/custom/feature-lifecycle.properties b/compose/config/drools-applications/custom/feature-lifecycle.properties index 053cd066..a68fb5ca 100644 --- a/compose/config/drools-applications/custom/feature-lifecycle.properties +++ b/compose/config/drools-applications/custom/feature-lifecycle.properties @@ -23,17 +23,18 @@ lifecycle.pdp.type=${envd:POLICY_PDP_PAP_TYPE:drools} # Mandatory policy types that this PDP-D must support at a minimum lifecycle.pdp.policytypes=${envd:POLICY_PDP_PAP_POLICYTYPES} -kafka.source.topics=policy-pdp-pap -kafka.sink.topics=policy-pdp-pap -kafka.source.topics.fetchTimeout=15000 +kafka.source.topics=${envd:POLICY_PDP_PAP_TOPIC} +kafka.sink.topics=${envd:POLICY_PDP_PAP_TOPIC} kafka.source.topics.policy-pdp-pap.fetchTimeout=15000 -kafka.source.topics.policy-pdp-pap.servers=kafka:9092 +kafka.source.topics.policy-pdp-pap.servers=${envd:KAFKA_SERVERS} kafka.source.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} kafka.source.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY} kafka.source.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} +kafka.source.topics.policy-pdp-pap.https=${envd:KAFKA_HTTPS:false} -kafka.sink.topics.policy-pdp-pap.servers=kafka:9092 +kafka.sink.topics.policy-pdp-pap.servers=${envd:KAFKA_SERVERS} kafka.sink.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} kafka.sink.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY} kafka.sink.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} +kafka.sink.topics.policy-pdp-pap.https=${envd:KAFKA_HTTPS:false} diff --git a/compose/config/drools-applications/env/base.conf b/compose/config/drools-applications/env/base.conf index 7f213ead..0f677239 100644 --- a/compose/config/drools-applications/env/base.conf +++ b/compose/config/drools-applications/env/base.conf @@ -60,6 +60,11 @@ MYSQL_CMD= HTTP_SERVER_HTTPS=false PROMETHEUS=true +# kafka server + +KAFKA_SERVERS=kafka:9092 +KAFKA_HTTPS=false + # LIVENESS Checks LIVENESS_CONTROLLERS=* @@ -67,6 +72,7 @@ LIVENESS_CONTROLLERS=* # PDP-D Kafka configuration channel PDPD_CONFIGURATION_TOPIC=pdpd-configuration +PDPD_CONFIGURATION_SERVERS=kafka:9092 PDPD_CONFIGURATION_API_KEY= PDPD_CONFIGURATION_API_SECRET= PDPD_CONFIGURATION_CONSUMER_GROUP= @@ -78,6 +84,7 @@ PDPD_CONFIGURATION_PARTITION_KEY= POLICY_PDP_PAP_TOPIC=policy-pdp-pap POLICY_PDP_PAP_API_KEY= POLICY_PDP_PAP_API_SECRET= +POLICY_PDP_PAP_POLICYTYPES=onap.policies.controlloop.operational.common.Drools # PAP @@ -101,7 +108,6 @@ DCAE_TOPIC=unauthenticated.dcae_cl_output DCAE_SERVERS=kafka:9092 DCAE_CONSUMER_GROUP=dcae.policy.shared - # AAI AAI_HOST=aai-sim diff --git a/compose/config/drools-applications/env/feature-pooling-messages.conf b/compose/config/drools-applications/env/feature-pooling-messages.conf index f90a9f04..967ae7bf 100644 --- a/compose/config/drools-applications/env/feature-pooling-messages.conf +++ b/compose/config/drools-applications/env/feature-pooling-messages.conf @@ -15,4 +15,4 @@ # limitations under the License. # ============LICENSE_END========================================================= -POOLING_TOPIC=pooling +POOLING_TOPIC=policy-pdp-pooling diff --git a/compose/config/drools-pdp/env/base.conf b/compose/config/drools-pdp/env/base.conf index a0b2a923..0e0156bd 100644 --- a/compose/config/drools-pdp/env/base.conf +++ b/compose/config/drools-pdp/env/base.conf @@ -102,6 +102,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared # kafka server KAFKA_SERVERS=kafka:9092 +KAFKA_HTTPS=false # AAI |