1 files changed, 2 insertions, 14 deletions
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 6cc45cc5c6..a04c37fe3d 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
@@ -41,40 +41,28 @@ participant:
           useHttps: false
           fetchTimeout: 15000
           topic: {{ .Values.global.kafkaTopics.acRuntimeTopic.name }}
-          {{ if .Values.global.useStrimziKafka }}
           topicCommInfrastructure: kafka
           servers:
-            - {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
+            - {{ include "common.release" . }}-{{ .Values.global.kafkaBootstrap }}
           additionalProps:
             group.id: {{ (first .Values.kafkaUser.acls).name }}
             allow.auto.create.topics: false
             security.protocol: SASL_PLAINTEXT
             sasl.mechanism: {{ .Values.kafkaUser.authenticationType | upper }}
             sasl.jaas.config: ${SASL_JAAS_CONFIG}
-          {{ else }}
-          topicCommInfrastructure: dmaap
-          servers:
-            - ${topicServer:message-router}
-          {{ end }}
       topicSinks:
         -
           useHttps: false
           fetchTimeout: 15000
           topic: {{ .Values.global.kafkaTopics.acRuntimeTopic.name }}
-          {{ if .Values.global.useStrimziKafka }}
           topicCommInfrastructure: kafka
           servers:
-            - {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
+            - {{ include "common.release" . }}-{{ .Values.global.kafkaBootstrap }}
           additionalProps:
             client.id: {{ (first .Values.kafkaUser.acls).name }}-client-id
             security.protocol: SASL_PLAINTEXT
             sasl.mechanism: {{ .Values.kafkaUser.authenticationType | upper }}
             sasl.jaas.config: ${SASL_JAAS_CONFIG}
-          {{ else }}
-          topicCommInfrastructure: dmaap
-          servers:
-            - ${topicServer:message-router}
-          {{ end }}
     participantSupportedElementTypes:
       -
         typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement