diff options
| author |   jhh <jorge.hernandez-herrero@att.com> | 2021-06-07 15:34:43 -0500 |
|---|---|---|
| committer | jhh <jorge.hernandez-herrero@att.com> | 2021-06-07 15:34:43 -0500 |
| commit | ed08c7f8d6d124cc3a6a42a5b630d549a5b34968 (patch) | |
| tree | cd9b3a6dae39a4b4e409b3f829575e0d15b079eb | |
| parent | 5608b5f613b0ea13232b8dfc266b8d7f9b20967b (diff) | |
Add global dmaap https flag for configuration
Since drools-pdp and derived applications typicall share
the same dmaap, this map will make easy to toggle between
https and http for those systems that need it.
https remains the default.
Issue-ID: POLICY-3366
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ib3556ed5f73e8a5485bc5c84a161753b1a50ce95
3 files changed, 4 insertions, 3 deletions
diff --git a/feature-legacy-config/src/main/feature/config/feature-legacy-config.properties b/feature-legacy-config/src/main/feature/config/feature-legacy-config.properties index fad32240..af5bd15c 100644 --- a/feature-legacy-config/src/main/feature/config/feature-legacy-config.properties +++ b/feature-legacy-config/src/main/feature/config/feature-legacy-config.properties @@ -25,4 +25,4 @@ 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} 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 |