Merge "[DMAAP] Remove AAF dependency"

8 files changed, 19 insertions, 19 deletions

diff --git a/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json b/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
index 7614a8c5b1..9136b6ed91 100755
--- a/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
+++ b/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
@@ -28,14 +28,14 @@
         "topicSources" : [{
             "topic" : "POLICY-PDP-PAP",
             "servers" : [ "message-router" ],
-            "useHttps" : {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
+            "useHttps" : "false",
             "fetchTimeout": 15000,
             "topicCommInfrastructure" : "dmaap"
         }],
         "topicSinks" : [{
             "topic" : "POLICY-PDP-PAP",
             "servers" : [ "message-router" ],
-            "useHttps" : {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
+            "useHttps" : "false",
             "topicCommInfrastructure" : "dmaap"
         }]
     }
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
index 51d4b47a15..d26ad6c70d 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
@@ -59,13 +59,13 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           fetchTimeout: 15000
-          useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+          useHttps: "false"
       topicSinks:
         - topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
-          useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+          useHttps: "false"
 # If Strimzi Kafka to be used for communication, replace clampAutomationCompositionTopics configuration with below
 #    clampAutomationCompositionTopics:
 #      topicSources:
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index bbe905b282..a3b82e70fb 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -62,14 +62,14 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           fetchTimeout: 15000
-          useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+          useHttps: "false"
       topicSinks:
         -
           topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
-          useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+          useHttps: "false"
 
 # If Strimzi Kafka to be used for communication, replace clampAutomationCompositionTopics configuration with below
 #    clampAutomationCompositionTopics:
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
index f24e0ff8c6..3ea4ac21b3 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml
@@ -78,14 +78,14 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           fetchTimeout: 15000
-          useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+          useHttps: "false"
       topicSinks:
         -
           topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
-          useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+          useHttps: "false"
 
 # If Strimzi Kafka to be used for communication, replace clampAutomationCompositionTopics configuration with below
 #    clampAutomationCompositionTopics:
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
index 3d192f4b6a..4a2bcf3684 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
@@ -85,7 +85,7 @@ runtime:
         servers:
           - ${topicServer:message-router}
         topicCommInfrastructure: dmaap
-        useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+        useHttps: "false"
         fetchTimeout: 15000
     topicSinks:
       -
@@ -93,7 +93,7 @@ runtime:
         servers:
           - ${topicServer:message-router}
         topicCommInfrastructure: dmaap
-        useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+        useHttps: "false"
 
 # If Strimzi Kafka to be used for communication, replace clampAutomationCompositionTopics configuration with below
 #  topicParameterGroup:
diff --git a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
index 22168e8753..a0b8bc7c4a 100755
--- a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
@@ -98,7 +98,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared
 # Open DMaaP
 
 DMAAP_SERVERS=message-router
-DMAAP_HTTPS={{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
+DMAAP_HTTPS="false"
 
 # AAI
 
diff --git a/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml b/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
index b68e8d6a71..fdcbf92745 100644
--- a/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
+++ b/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
@@ -76,7 +76,7 @@ pap:
     - topic: POLICY-PDP-PAP
       servers:
       - message-router
-      useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
+      useHttps: false
       fetchTimeout: 15000
       topicCommInfrastructure: dmaap
     - topic: POLICY-HEARTBEAT
@@ -84,19 +84,19 @@ pap:
       consumerGroup: policy-pap
       servers:
       - message-router
-      useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
+      useHttps: false
       fetchTimeout: 15000
       topicCommInfrastructure: dmaap
     topicSinks:
     - topic: POLICY-PDP-PAP
       servers:
       - message-router
-      useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
+      useHttps: false
       topicCommInfrastructure: dmaap
     - topic: POLICY-NOTIFICATION
       servers:
       - message-router
-      useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
+      useHttps: false
       topicCommInfrastructure: dmaap
 # If Strimzi Kafka to be used for communication, replace following configuration for topicSources and topicSinks
 #          servers:
@@ -124,8 +124,8 @@ pap:
     basePath: healthcheck
   - clientName: dmaap
     hostname: message-router
-    port: {{ (eq "true" (include "common.needTLS" .)) | ternary 3905 3904 }}
-    useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
+    port: 3904
+    useHttps: false
     basePath: topics
 
 management:
diff --git a/kubernetes/policy/components/policy-xacml-pdp/resources/config/config.json b/kubernetes/policy/components/policy-xacml-pdp/resources/config/config.json
index 0f1744a9e4..d049626106 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/resources/config/config.json
+++ b/kubernetes/policy/components/policy-xacml-pdp/resources/config/config.json
@@ -45,14 +45,14 @@
         "topicSources" : [{
             "topic" : "POLICY-PDP-PAP",
             "servers" : [ "message-router" ],
-            "useHttps" : {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
+            "useHttps" : "false",
             "fetchTimeout" : 15000,
             "topicCommInfrastructure" : "dmaap"
         }],
         "topicSinks" : [{
             "topic" : "POLICY-PDP-PAP",
             "servers" : [ "message-router" ],
-            "useHttps" : {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
+            "useHttps" : "false",
             "topicCommInfrastructure" : "dmaap"
         }]
     }