5 files changed, 27 insertions, 24 deletions
diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml
index e76a1d9431..385b5f472d 100644
--- a/kubernetes/message-router/templates/all-services.yaml
+++ b/kubernetes/message-router/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: zookeeper
 spec:
@@ -20,7 +20,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: global-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: global-kafka
 spec:
@@ -37,7 +37,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: dmaap
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: dmaap
     version: 1.0.0
diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index 1d9777e760..cc13a382da 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -2,9 +2,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: dmaap
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: message-router-dmaap
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.dmaapReplicas }}
   selector:
     matchLabels:
       app: dmaap
@@ -12,7 +13,7 @@ spec:
     metadata:
       labels:
         app: dmaap
-      name: dmaap
+      name: message-router-dmaap
     spec:
       initContainers:
       - command:
@@ -60,13 +61,13 @@ spec:
           path: /etc/localtime
       - name: appprops
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties
+          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties
       - name: cadi
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties
+          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties
       - name: mykey
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
+          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 {{ end }}
diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index 509b15fc53..ca38da414f 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -2,9 +2,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: global-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: message-router-global-kafka
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.kafkaReplicas }}
   selector:
     matchLabels:
       app: global-kafka
@@ -12,7 +13,7 @@ spec:
     metadata:
       labels:
         app: global-kafka
-      name: global-kafka
+      name: message-router-global-kafka
     spec:
       initContainers:
       - command:
@@ -42,7 +43,7 @@ spec:
           periodSeconds: 10
         env:
         - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "zookeeper.{{ .Values.nsPrefix }}-message-router:2181"
+          value: "zookeeper.{{ .Values.nsPrefix }}:2181"
         - name: KAFKA_ADVERTISED_HOST_NAME
           value: "global-kafka"
         - name: KAFKA_BROKER_ID
diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
index 53329ca29b..1518913f31 100644
--- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml
+++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: "{{ .Values.nsPrefix }}-message-router-kafka"
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     name: "{{ .Values.nsPrefix }}-message-router-kafka"
 spec:
@@ -13,13 +13,13 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: message-router-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -36,7 +36,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
 spec:
@@ -46,13 +46,13 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: message-router-zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -62,4 +62,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
-#{{ end }}
-\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml
index 47cdb51f2f..0dd8723ef0 100644
--- a/kubernetes/message-router/templates/message-router-zookeeper.yaml
+++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml
@@ -2,9 +2,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: message-router-zookeeper
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.zookeeperReplicas }}
   selector:
     matchLabels:
       app: zookeeper
@@ -12,7 +13,7 @@ spec:
     metadata:
       labels:
         app: zookeeper
-      name: zookeeper
+      name: message-router-zookeeper
     spec:
       containers:
       - image: {{ .Values.image.zookeeper }}
@@ -41,4 +42,4 @@ spec:
           claimName: message-router-zookeeper
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
-\ No newline at end of file
+#{{ end }}