Merge "[DMAAP] Fix scaling logic for message router kafka and zookeeper"

diff --cc kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml
index 62a25e6,ba872a3..c16500e
--- 1/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml
--- 2/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml
@@@ -166,9 -164,11 +166,9 @@@ spec
                apiVersion: v1
                fieldPath: status.hostIP
          - name: KAFKA_ZOOKEEPER_CONNECT
-           value: {{ include "common.release" . }}-{{.Values.zookeeper.name}}-0.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}},{{ include "common.release" . }}-{{.Values.zookeeper.name}}-1.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}},{{ include "common.release" . }}-{{.Values.zookeeper.name}}-2.{{.Values.zookeeper.name}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.zookeeper.port}}
+           value: "{{ include "common.kafkaNodes" (dict "dot" . "replicaCount" .Values.zookeeper.replicaCount "componentName" .Values.zookeeper.name "port" .Values.zookeeper.port ) }}"
          - name: KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE
            value: "{{ .Values.kafka.enableSupport }}"
 -        - name: KAFKA_OPTS
 -          value: "{{ .Values.kafka.jaasOptions }}"
          {{- if  .Values.global.aafEnabled }}
          - name: KAFKA_OPTS
            value: "{{ .Values.kafka.jaasOptionsAaf }}"

diff --cc kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
Simple merge