diff options
Diffstat (limited to 'controlloop/common/feature-controlloop-management/src')
11 files changed, 33 insertions, 21 deletions
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties index 2efeaba17..c089e3645 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties @@ -18,6 +18,7 @@ # ============LICENSE_END========================================================= kafka.source.topics=a1-p-rsp -kafka.source.topics.a1-p-rsp.servers=${envd:KAFKA_SERVERS} -kafka.source.topics.a1-p-rsp.https=${envd:KAFKA_HTTPS:false} +kafka.source.topics.a1-p-rsp.servers=${env:KAFKA_SERVERS} +kafka.source.topics.a1-p-rsp.https=${env:KAFKA_HTTPS:false} +kafka.source.topics.a1-p-rsp.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties index a5c0ae9b1..360db50bc 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties @@ -18,6 +18,7 @@ # ============LICENSE_END========================================================= kafka.sink.topics=a1-p -kafka.sink.topics.a1-p.servers=${envd:KAFKA_SERVERS} -kafka.sink.topics.a1-p.https=${envd:KAFKA_HTTPS:false} +kafka.sink.topics.a1-p.servers=${env:KAFKA_SERVERS} +kafka.sink.topics.a1-p.https=${env:KAFKA_HTTPS:false} +kafka.sink.topics.a1-p.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties index 5970ebc75..b8401e145 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties @@ -18,9 +18,11 @@ # ============LICENSE_END========================================================= kafka.source.topics=appc-cl -kafka.source.topics.appc-cl.servers=${envd:KAFKA_SERVERS} -kafka.source.topics.appc-cl.https=${envd:KAFKA_HTTPS:false} +kafka.source.topics.appc-cl.servers=${env:KAFKA_SERVERS} +kafka.source.topics.appc-cl.https=${env:KAFKA_HTTPS:false} +kafka.source.topics.appc-cl.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} kafka.sink.topics=appc-cl -kafka.sink.topics.appc-cl.servers=${envd:KAFKA_SERVERS} -kafka.sink.topics.appc-cl.https=${envd:KAFKA_HTTPS:false} +kafka.sink.topics.appc-cl.servers=${env:KAFKA_SERVERS} +kafka.sink.topics.appc-cl.https=${env:KAFKA_HTTPS:false} +kafka.sink.topics.appc-cl.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties index 40efa7ee9..448d16aa2 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties @@ -18,5 +18,6 @@ # ============LICENSE_END========================================================= kafka.sink.topics=appc-lcm-read -kafka.sink.topics.appc-lcm-read.servers=${envd:KAFKA_SERVERS} -kafka.sink.topics.appc-lcm-read.https=${envd:KAFKA_HTTPS:false} +kafka.sink.topics.appc-lcm-read.servers=${env:KAFKA_SERVERS} +kafka.sink.topics.appc-lcm-read.https=${env:KAFKA_HTTPS:false} +kafka.sink.topics.appc-lcm-read.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties index a0a3065ee..4c75043f0 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties @@ -18,5 +18,6 @@ # ============LICENSE_END========================================================= kafka.source.topics=appc-lcm-write -kafka.source.topics.appc-lcm-write.servers=${envd:KAFKA_SERVERS} -kafka.source.topics.appc-lcm-write.https=${envd:KAFKA_HTTPS:false} +kafka.source.topics.appc-lcm-write.servers=${env:KAFKA_SERVERS} +kafka.source.topics.appc-lcm-write.https=${env:KAFKA_HTTPS:false} +kafka.source.topics.appc-lcm-write.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties index e3572c9c0..9f5a400eb 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties @@ -20,3 +20,4 @@ kafka.sink.topics=dcae_cl_rsp kafka.sink.topics.dcae_cl_rsp.servers=${env:KAFKA_SERVERS} kafka.sink.topics.dcae_cl_rsp.https=${envd:KAFKA_HTTPS:false} +kafka.sink.topics.dcae_cl_rsp.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties index 6b2da4896..c7b433cc1 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties @@ -19,6 +19,7 @@ kafka.source.topics=dcae_topic kafka.source.topics.dcae_topic.effectiveTopic=${envd:DCAE_TOPIC} -kafka.source.topics.dcae_topic.servers=${envd:KAFKA_SERVERS} +kafka.source.topics.dcae_topic.servers=${env:KAFKA_SERVERS} kafka.source.topics.dcae_topic.consumerGroup=${envd:DCAE_CONSUMER_GROUP} -kafka.source.topics.dcae_topic.https=${envd:KAFKA_HTTPS:false} +kafka.source.topics.dcae_topic.https=${env:KAFKA_HTTPS:false} +kafka.source.topics.dcae_topic.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties index 7a6a4fb83..477a9da38 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties @@ -18,5 +18,6 @@ # ============LICENSE_END========================================================= kafka.sink.topics=policy-cl-mgt -kafka.sink.topics.policy-cl-mgt.servers=${envd:KAFKA_SERVERS} -kafka.sink.topics.policy-cl-mgt.https=${envd:KAFKA_HTTPS:false} +kafka.sink.topics.policy-cl-mgt.servers=${env:KAFKA_SERVERS} +kafka.sink.topics.policy-cl-mgt.https=${env:KAFKA_HTTPS:false} +kafka.sink.topics.policy-cl-mgt.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties index 001b9c0e2..abba1bf09 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties @@ -18,5 +18,6 @@ # ============LICENSE_END========================================================= kafka.source.topics=sdnr-cl-rsp -kafka.source.topics.sdnr-cl-rsp.servers=${envd:KAFKA_SERVERS} -kafka.source.topics.sdnr-cl-rsp.https=${envd:KAFKA_HTTPS:false} +kafka.source.topics.sdnr-cl-rsp.servers=${env:KAFKA_SERVERS} +kafka.source.topics.sdnr-cl-rsp.https=${env:KAFKA_HTTPS:false} +kafka.source.topics.sdnr-cl-rsp.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties index 3a58f8f42..f78fe76b7 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties @@ -18,5 +18,6 @@ # ============LICENSE_END========================================================= kafka.sink.topics=sdnr-cl -kafka.sink.topics.sdnr-cl.servers=${envd:KAFKA_SERVERS} -kafka.sink.topics.sdnr-cl.https=${envd:KAFKA_HTTPS:false} +kafka.sink.topics.sdnr-cl.servers=${env:KAFKA_SERVERS} +kafka.sink.topics.sdnr-cl.https=${env:KAFKA_HTTPS:false} +kafka.sink.topics.sdnr-cl.additionalProps=${env:KAFKA_ADDITIONAL_PROPS} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties index 7124989b5..96d2f9aea 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties @@ -24,12 +24,13 @@ operation.history.url=${envd:JDBC_URL}operationshistory${envd:JDBC_OPTS} operation.history.userName=${envd:SQL_USER} operation.history.password=${envd:SQL_PASSWORD} +operation.history.driver=${envd:JDBC_DRIVER} # # Actor parameters # # Note: every operation must have at least one entry, otherwise it will not be -# configured and started. Thus some of them have a "placeholder" property. +# configured and started. Thus, some of them have a "placeholder" property. # actor.service.XACML.disabled=${envd:GUARD_DISABLED:false} |