summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2022-03-17 17:40:24 -0500
committerjhh <jorge.hernandez-herrero@att.com>2022-03-17 17:57:24 -0500
commit93d4ee603e563d292845e12b85811bd9e8c42d44 (patch)
treee14a3ef49dfe8c21d8886f2e97eae3eb4c25cc2c
parent64b967be75708faff5f531591fa2f87bf722bffe (diff)
Reuse https environment flags drools csits
Issue-ID: POLICY-3995 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ic5eb0397c5f58169845bd07f4fb2d9ab5b039b6d
-rw-r--r--csit/config/drools-apps/custom/feature-lifecycle.properties4
-rw-r--r--csit/config/drools-apps/env/base.conf7
-rw-r--r--csit/config/drools/env/base.conf2
3 files changed, 9 insertions, 4 deletions
diff --git a/csit/config/drools-apps/custom/feature-lifecycle.properties b/csit/config/drools-apps/custom/feature-lifecycle.properties
index edf0759f..dcbf290e 100644
--- a/csit/config/drools-apps/custom/feature-lifecycle.properties
+++ b/csit/config/drools-apps/custom/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={{HTTPS_ENABLED}}
+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={{HTTPS_ENABLED}}
+dmaap.sink.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true}
diff --git a/csit/config/drools-apps/env/base.conf b/csit/config/drools-apps/env/base.conf
index bef42c99..7b65681d 100644
--- a/csit/config/drools-apps/env/base.conf
+++ b/csit/config/drools-apps/env/base.conf
@@ -62,6 +62,10 @@ AAF_HOST=aaf.api.simpledemo.onap.org
HTTP_SERVER_HTTPS={{HTTPS_ENABLED}}
PROMETHEUS=true
+# LIVENESS Checks
+
+LIVENESS_CONTROLLERS=*
+
# PDP-D DMaaP configuration channel
PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION
@@ -92,6 +96,7 @@ PDP_CONTEXT_URI=policy/pdpx/v1/
PDP_USERNAME=healthcheck
PDP_PASSWORD=zb!XztG34
+
# DCAE DMaaP
DCAE_TOPIC=unauthenticated.DCAE_CL_OUTPUT
@@ -101,7 +106,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared
# Open DMaaP
DMAAP_SERVERS=message-router
-DMAAP_HTTPS=true
+DMAAP_HTTPS={{HTTPS_ENABLED}}
# AAI
diff --git a/csit/config/drools/env/base.conf b/csit/config/drools/env/base.conf
index 9871d62c..fd4d66fc 100644
--- a/csit/config/drools/env/base.conf
+++ b/csit/config/drools/env/base.conf
@@ -104,7 +104,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared
# Open DMaaP
DMAAP_SERVERS=mr.api.simpledemo.onap.org
-DMAAP_HTTPS=true
+DMAAP_HTTPS={{HTTPS_ENABLED}}
# AAI