Merge "Update annotations to spec for log"

[oom.git] / kubernetes / vid / templates / vid-server-deployment.yaml

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 8226f54..5354dba 100644 (file)
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVidVidServer }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -54,19 +55,19 @@ spec:
         - name: VID_AAI_PORT
           value: "8443"
         - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/context
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/context
         - name: VID_MSO_SERVER_URL
           value: http://mso.{{ .Values.nsPrefix }}-mso:8080
         - name: VID_MSO_PASS
-          value: 51515201a8d4c5c08d533db9bd1e1a9b
+          value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
         - name: MSO_DME2_SERVER_URL
           value: http://localhost:8081
         - name: MSO_DME2_ENABLED
           value: "false"
         - name: VID_ECOMP_REDIRECT_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/login.htm
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/login.htm
         - name: VID_ECOMP_REST_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/auxapi
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/auxapi
         - name: VID_CONTACT_US_LINK
           value: https://todo_contact_us_link.com
         - name: VID_UEB_URL_LIST
@@ -86,21 +87,20 @@ spec:
         image: {{ .Values.image.vid }} 
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vid-server
-        volumeMounts:
-        - mountPath: /var/log/onap
-          name: vid-logs
-        - mountPath: /tmp/logback.xml
-          name: vid-logback
         lifecycle:
           postStart:
             exec:
-              command: ["/bin/sh", "-c", "sleep 20; cp -f /tmp/logback.xml /usr/local/tomcat/webapps/vid/WEB-INF/classes/logback.xml"]
+              command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/usr/local/tomcat/webapps/vid/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
         ports:
         - containerPort: 8080
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
+        - mountPath: /var/log/onap
+          name: vid-logs
+        - mountPath: /tmp/logback.xml
+          name: vid-logback
         readinessProbe:
           tcpSocket:
             port: 8080
@@ -132,3 +132,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}