diff options
6 files changed, 14 insertions, 8 deletions
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties index 774bbadb3..a32511743 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties @@ -2,6 +2,7 @@ # ONAP # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ http.client.services=AAI http.client.services.AAI.managed=true -http.client.services.AAI.https=true +http.client.services.AAI.https=${envd:AAI_HTTPS:true} http.client.services.AAI.host=${envd:AAI_HOST} http.client.services.AAI.port=${envd:AAI_PORT} http.client.services.AAI.userName=${envd:AAI_USERNAME} 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..01b091557 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 @@ -2,13 +2,14 @@ # ONAP # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,4 +20,4 @@ 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.https=${envd:DMAAP_HTTPS:true} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties index 1a8990b4d..03f329a39 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties @@ -2,6 +2,7 @@ # ONAP # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ http.client.services=SDNC http.client.services.SDNC.managed=true -http.client.services.SDNC.https=true +http.client.services.SDNC.https=${envd:SDNC_HTTPS:true} http.client.services.SDNC.host=${envd:SDNC_HOST} http.client.services.SDNC.port=${envd:SDNC_PORT} http.client.services.SDNC.userName=${envd:SDNC_USERNAME} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties index 3b71fd474..7415753ec 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties @@ -2,6 +2,7 @@ # ONAP # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ http.client.services=SO http.client.services.SO.managed=true -http.client.services.SO.https=false +http.client.services.SO.https=${envd:SO_HTTPS:false} http.client.services.SO.host=${envd:SO_HOST} http.client.services.SO.port=${envd:SO_PORT} http.client.services.SO.userName=${envd:SO_USERNAME} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties index a781ed2d1..c9d92087d 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties @@ -2,6 +2,7 @@ # ONAP # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ http.client.services=VFC http.client.services.VFC.managed=true -http.client.services.VFC.https=true +http.client.services.VFC.https=${envd:VFC_HTTPS:true} http.client.services.VFC.host=${envd:VFC_HOST} http.client.services.VFC.port=${envd:VFC_PORT} http.client.services.VFC.userName=${envd:VFC_USERNAME} diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties index 6865c68ed..dd8ba2677 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/XACML-http-client.properties @@ -2,6 +2,7 @@ # ONAP # ================================================================================ # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ http.client.services=XACML http.client.services.XACML.managed=true -http.client.services.XACML.https=true +http.client.services.XACML.https=${envd:PDP_HTTPS:true} http.client.services.XACML.host=${envd:PDP_HOST} http.client.services.XACML.port=${envd:PDP_PORT} http.client.services.XACML.userName=${envd:PDP_USERNAME} |