diff options
Diffstat (limited to 'controlloop/common/feature-controlloop-management')
8 files changed, 30 insertions, 28 deletions
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 080dcd9c6..ec0eca7c1 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 @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-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. @@ -19,8 +19,8 @@ dmaap.source.topics=APPC-CL dmaap.sink.topics=APPC-CL -dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.APPC-CL.https=true +dmaap.source.topics.APPC-CL.servers=${envd:DMAAP_SERVERS} +dmaap.source.topics.APPC-CL.https=${envd:DMAAP_HTTPS:true} -dmaap.sink.topics.APPC-CL.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.APPC-CL.https=true +dmaap.sink.topics.APPC-CL.servers=${envd:DMAAP_SERVERS} +dmaap.sink.topics.APPC-CL.https=${envd:DMAAP_HTTPS:true} 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 1be069303..4db48acf3 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 @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-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,5 +18,5 @@ dmaap.sink.topics=APPC-LCM-READ -dmaap.sink.topics.APPC-LCM-READ.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.APPC-LCM-READ.https=true +dmaap.sink.topics.APPC-LCM-READ.servers=${envd:DMAAP_SERVERS} +dmaap.sink.topics.APPC-LCM-READ.https=${envd:DMAAP_HTTPS:true} 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 1eb330357..50985a25e 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 @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-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,5 +18,6 @@ dmaap.source.topics=APPC-LCM-WRITE -dmaap.source.topics.APPC-LCM-WRITE.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.APPC-LCM-WRITE.https=true +dmaap.source.topics.APPC-LCM-WRITE.servers=${envd:DMAAP_SERVERS} +dmaap.source.topics.APPC-LCM-WRITE.https=${envd:DMAAP_HTTPS:true} + 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 890110f36..524f25f49 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 @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-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,5 +18,5 @@ dmaap.sink.topics=DCAE_CL_RSP -dmaap.sink.topics.DCAE_CL_RSP.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.DCAE_CL_RSP.https=true +dmaap.sink.topics.DCAE_CL_RSP.servers=${envd:DMAAP_SERVERS} +dmaap.sink.topics.DCAE_CL_RSP.https=${envd:DMAAP_HTTPS:true} 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 d038f8760..26833f484 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 @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-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,7 +18,7 @@ dmaap.source.topics=DCAE_TOPIC -dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC} -dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP} -dmaap.source.topics.DCAE_TOPIC.https=true +dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${envd:DCAE_TOPIC} +dmaap.source.topics.DCAE_TOPIC.servers=${envd:DMAAP_SERVERS} +dmaap.source.topics.DCAE_TOPIC.consumerGroup=${envd:DCAE_CONSUMER_GROUP} +dmaap.source.topics.DCAE_TOPIC.https=${envd:DMAAP_HTTPS:true} 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 e9975bcfb..10f442bd3 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 @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-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. @@ -17,5 +17,5 @@ # ============LICENSE_END========================================================= dmaap.sink.topics=POLICY-CL-MGT -dmaap.sink.topics.POLICY-CL-MGT.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.POLICY-CL-MGT.https=true +dmaap.sink.topics.POLICY-CL-MGT.servers=${envd:DMAAP_SERVERS} +dmaap.sink.topics.POLICY-CL-MGT.https=${envd:DMAAP_HTTPS:true} 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 ec1b1349d..34dd43c63 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 @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-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. @@ -17,5 +17,6 @@ # ============LICENSE_END========================================================= dmaap.source.topics=SDNR-CL-RSP -dmaap.source.topics.SDNR-CL-RSP.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.SDNR-CL-RSP.https=true +dmaap.source.topics.SDNR-CL-RSP.servers=${envd:DMAAP_SERVERS} +dmaap.source.topics.SDNR-CL-RSP.https=${envd:DMAAP_HTTPS:true} + 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 4d2a0bb1e..390c06b66 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 @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-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,6 +18,6 @@ dmaap.sink.topics=SDNR-CL -dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.SDNR-CL.https=true +dmaap.sink.topics.SDNR-CL.servers=${envd:DMAAP_SERVERS} +dmaap.sink.topics.SDNR-CL.https=${envd:DMAAP_HTTPS:true} |