X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Ftemplates%2Fdata-router-deployment.yaml;h=b1cb834eeb567717a2e1a78a872aba8a030a8776;hb=ac64381cf7e218c31af86be8f2164f4c7b8dba32;hp=6fb1751f1d22c16b255998667c114b5040e5a983;hpb=b19df8009d73ba3273f3529fced4c96c2cc4a4a6;p=oom.git

diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
index 6fb1751f1d..b1cb834eeb 100644
--- a/kubernetes/aai/templates/data-router-deployment.yaml
+++ b/kubernetes/aai/templates/data-router-deployment.yaml
@@ -1,19 +1,33 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #{{ if not .Values.disableAaiDataRouter }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: data-router
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-data-router
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.dataRouterReplicas }}
   selector:
     matchLabels:
-      app: data-router
+      app: aai-data-router
   template:
     metadata:
       labels:
-        app: data-router
-      name: data-router
+        app: aai-data-router
+      name: aai-data-router
     spec:
       initContainers:
       - command:
@@ -35,10 +49,10 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: init-sysctl
         volumeMounts:
-        - name: data-router-logs
+        - name: aai-data-router-logs
           mountPath: /logroot/
       containers:
-      - name: data-router
+      - name: aai-data-router
         image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         env:
@@ -62,29 +76,29 @@ spec:
           readOnly: true
         - mountPath: /opt/app/data-router/config/model/aai_oxm_v8.xml
           subPath: aai_oxm_v8.xml
-          name: data-router-model-v8
+          name: aai-data-router-model-v8
         - mountPath: /opt/app/data-router/config/model/aai_oxm_v9.xml
           subPath: aai_oxm_v9.xml
-          name: data-router-model-v9
+          name: aai-data-router-model-v9
         - mountPath: /opt/app/data-router/config/model/aai_oxm_v10.xml
           subPath: aai_oxm_v10.xml
-          name: data-router-model-v10
+          name: aai-data-router-model-v10
         - mountPath: /opt/app/data-router/config/model/aai_oxm_v11.xml
           subPath: aai_oxm_v11.xml
-          name: data-router-model-v11
+          name: aai-data-router-model-v11
         - mountPath:  /opt/app/data-router/config/auth
-          name: data-router-auth
+          name: aai-data-router-auth
         - mountPath:  /opt/app/data-router/config/data-router.properties
-          name: data-router-properties
+          name: aai-data-router-properties
           subPath: data-router.properties
         - mountPath: /opt/app/data-router/dynamic/routes/entity-event.route
           subPath: entity-event.route
-          name: data-router-dynamic-route
+          name: aai-data-router-dynamic-route
         - mountPath: /opt/app/data-router/dynamic/conf/entity-event-policy.xml
           subPath: entity-event-policy.xml
-          name: data-router-dynamic-policy
+          name: aai-data-router-dynamic-policy
         - mountPath: /logs/
-          name: data-router-logs
+          name: aai-data-router-logs
         ports:
         - containerPort: 9502
         readinessProbe:
@@ -96,34 +110,35 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: data-router-model-v8
+      - name: aai-data-router-model-v8
         configMap:
-          name: data-router-model-v8-configmap
-      - name: data-router-model-v9
+          name: aai-data-router-model-v8-configmap
+      - name: aai-data-router-model-v9
         configMap:
-          name: data-router-model-v9-configmap
-      - name: data-router-model-v10
+          name: aai-data-router-model-v9-configmap
+      - name: aai-data-router-model-v10
         configMap:
-          name: data-router-model-v10-configmap
-      - name: data-router-model-v11
+          name: aai-data-router-model-v10-configmap
+      - name: aai-data-router-model-v11
         configMap:
-          name: data-router-model-v11-configmap
-      - name: data-router-auth
+          name: aai-data-router-model-v11-configmap
+      - name: aai-data-router-auth
         secret:
-          secretName: data-router-secret
-      - name: data-router-properties
+          secretName: aai-data-router-secret
+      - name: aai-data-router-properties
         configMap:
-          name: data-router-prop-configmap
-      - name: data-router-dynamic-route
+          name: aai-data-router-prop-configmap
+      - name: aai-data-router-dynamic-route
         configMap:
-          name: data-router-dynamic-configmap
-      - name: data-router-dynamic-policy
+          name: aai-data-router-dynamic-configmap
+      - name: aai-data-router-dynamic-policy
         configMap:
-          name: data-router-dynamic-configmap
-      - name: data-router-logs
+          name: aai-data-router-dynamic-configmap
+      - name: aai-data-router-logs
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs"
+          path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/data-router/logs
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}
+