X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fvid%2Ftemplates%2Fvid-server-deployment.yaml;h=7903fb02b139abc6c8eac042f8cac348c0a23429;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=832fdeb93c072ada9fff91080dd08a1ade4b7689;hpb=8db8b1825e199e295a2429c450d6cc9f5825c2e1;p=oom.git

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 832fdeb93c..7903fb02b1 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -1,3 +1,17 @@
+# 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.disableVidVidServer }}
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -5,8 +19,9 @@ metadata:
   labels:
     app: vid-server
   name: vid-server
-  namespace: "{{ .Values.nsPrefix }}-vid"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.vidServerReplicas }}
   selector:
     matchLabels:
       app: vid-server
@@ -34,19 +49,19 @@ spec:
       containers:
       - env:
         - name: ASDC_CLIENT_REST_HOST
-          value: sdc-be.{{ .Values.nsPrefix }}-sdc
+          value: sdc-be.{{ .Values.nsPrefix }}
         - name: ASDC_CLIENT_REST_AUTH
           value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
         - name: ASDC_CLIENT_REST_PORT
           value: "8080"
         - name: VID_AAI_HOST
-          value: aai-service.{{ .Values.nsPrefix }}-aai
+          value: aai-service.{{ .Values.nsPrefix }}
         - name: VID_AAI_PORT
           value: "8443"
         - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/context
+          value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/context
         - name: VID_MSO_SERVER_URL
-          value: http://mso.{{ .Values.nsPrefix }}-mso:8080
+          value: http://mso.{{ .Values.nsPrefix }}:8080
         - name: VID_MSO_PASS
           value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
         - name: MSO_DME2_SERVER_URL
@@ -54,13 +69,13 @@ spec:
         - name: MSO_DME2_ENABLED
           value: "false"
         - name: VID_ECOMP_REDIRECT_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/login.htm
+          value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/login.htm
         - name: VID_ECOMP_REST_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/auxapi
+          value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/auxapi
         - name: VID_CONTACT_US_LINK
           value: https://todo_contact_us_link.com
         - name: VID_UEB_URL_LIST
-          value: dmaap.{{ .Values.nsPrefix }}-message-router
+          value: dmaap.{{ .Values.nsPrefix }}
         - name: VID_MYSQL_HOST
           value: vid-mariadb
         - name: VID_MYSQL_PORT
@@ -73,7 +88,7 @@ spec:
           value: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
         - name: VID_MYSQL_MAXCONNECTIONS
           value: "5"
-        image: {{ .Values.image.vid }} 
+        image: {{ .Values.image.vid }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vid-server
         lifecycle:
@@ -90,6 +105,7 @@ spec:
           name: vid-logs
         - mountPath: /tmp/logback.xml
           name: vid-logback
+          subPath: logback.xml
         readinessProbe:
           tcpSocket:
             port: 8080
@@ -101,6 +117,7 @@ spec:
         volumeMounts:
         - mountPath: /usr/share/filebeat/filebeat.yml
           name: filebeat-conf
+          subPath: filebeat.yml
         - mountPath: /var/log/onap
           name: vid-logs
         - mountPath: /usr/share/filebeat/data
@@ -110,15 +127,15 @@ spec:
           hostPath:
             path: /etc/localtime
         - name: filebeat-conf
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+          configMap:
+            name: vid-filebeat-configmap
         - name: vid-logs
           emptyDir: {}
         - name: vid-data-filebeat
           emptyDir: {}
         - name: vid-logback
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml
+          configMap:
+            name: vid-log-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}