diff options
| author |   jhh <jorge.hernandez-herrero@att.com> | 2021-06-08 11:48:24 -0500 |
|---|---|---|
| committer | jhh <jorge.hernandez-herrero@att.com> | 2021-06-08 11:48:24 -0500 |
| commit | 280fbd4472652b1a4fa796c5bec7ee9e01f72f3b (patch) | |
| tree | 2caebcf10976450fe4e0c2e154b169e72730e1b5 | |
| parent | f4a116014fb1efa6c0731f3dc9553836d276ad15 (diff) | |
Add global dmaap https flag as default config
Issue-ID: POLICY-3366
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I198363e1d301dda8239d00be821c878205b13c7b
| -rw-r--r-- | feature-lifecycle/src/main/feature/config/feature-lifecycle.properties | 4 | ||||
| -rw-r--r-- | packages/install/src/files/base.conf | 1 | ||||
| -rw-r--r-- | policy-management/src/main/server/config/engine.properties | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties b/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties index fc8127b9..d79c9e50 100644 --- a/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties +++ b/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties @@ -29,10 +29,10 @@ dmaap.source.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS} dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} dmaap.source.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY} dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} -dmaap.source.topics.POLICY-PDP-PAP.https=true +dmaap.source.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true} dmaap.sink.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS} dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY} dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} -dmaap.sink.topics.POLICY-PDP-PAP.https=true +dmaap.sink.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true} diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index 5365b3a5..d6b38d10 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -126,6 +126,7 @@ DCAE_CONSUMER_GROUP= # Open DMaaP DMAAP_SERVERS= +DMAAP_HTTPS=true # AAI diff --git a/policy-management/src/main/server/config/engine.properties b/policy-management/src/main/server/config/engine.properties index 4f114d88..4afa9474 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. @@ -29,7 +29,7 @@ dmaap.source.topics.PDPD-CONFIGURATION.apiSecret=${envd:PDPD_CONFIGURATION_API_S 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 +dmaap.source.topics.PDPD-CONFIGURATION.https=${envd:DMAAP_HTTPS:true} http.server.services=SECURED-CONFIG |