Merge "[POLICY] Add kafka support in policy charts"

[oom.git] / kubernetes / policy / components / policy-apex-pdp / resources / config / OnapPfConfig.json

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 3a38b88..441955f 100755 (executable)
--- a/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
+++ b/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
@@ -30,23 +30,17 @@
           "useHttps": false,
           "fetchTimeout": 15000,
           "servers": [ "${KAFKA_URL}" ],
-{{ if .Values.global.useStrimziKafkaPf }}
           "topicCommInfrastructure": "kafka",
           "additionalProps": {
             "group.id" : "${GROUP_ID}",
             "security.protocol": "SASL_PLAINTEXT",
             "sasl.mechanism": "${SASL}",
             "sasl.jaas.config": "${JAASLOGIN}"
-          }
-{{ else }}
-          "topicCommInfrastructure": "dmaap"
-{{ end }}
-        }],
+        }}],
       "topicSinks" : [{
           "topic": "${PAP_TOPIC}",
           "useHttps": false,
           "servers": [ "${KAFKA_URL}" ],
-{{ if .Values.global.useStrimziKafkaPf }}
           "topicCommInfrastructure": "kafka",
           "additionalProps": {
             "group.id" : "${GROUP_ID}",
@@ -54,9 +48,6 @@
             "sasl.mechanism": "${SASL}",
             "sasl.jaas.config": "${JAASLOGIN}"
           }
-{{ else }}
-          "topicCommInfrastructure": "dmaap"
-{{ end }}
       }]
     }
 }