From: Roger Maitland <Roger.Maitland@amdocs.com>
Date: Wed, 2 May 2018 20:03:15 +0000 (-0400)
Subject: Fix VID environment variables
X-Git-Tag: 2.0.0-ONAP~190
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0c6d4b84819ef03fceaf64d220854432f4cbb6ca;p=oom.git

Fix VID environment variables

Change-Id: I9f6487d4588c443817010e727515e0f262ba0d01
Signed-off-by: Roger Maitland <Roger.Maitland@amdocs.com>
Issue-ID: OOM-1034
---

diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 929c260815..5491808b9c 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -77,13 +77,13 @@ spec:
             - name: ASDC_CLIENT_REST_PORT
               value: "{{ .Values.config.asdcclientrestport }}"
             - name: VID_AAI_HOST
-              value: aai-service.{{ include "common.namespace" . }}
+              value: aai.{{ include "common.namespace" . }}
             - name: VID_AAI_PORT
               value: "{{ .Values.config.vidaaiport }}"
             - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
-              value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/context
+              value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/context
             - name: VID_MSO_SERVER_URL
-              value: http://mso.{{ include "common.namespace" . }}:"{{ .Values.config.msoport }}"
+              value: http://mso.{{ include "common.namespace" . }}:{{ .Values.config.msoport }}
             - name: VID_MSO_PASS
               value: "{{ .Values.config.vidmsopass }}"
             - name: MSO_DME2_SERVER_URL
@@ -91,9 +91,9 @@ spec:
             - name: MSO_DME2_ENABLED
               value: {{ .Values.global.debugEnabled | default .Values.debugEnabled | quote }}
             - name: VID_ECOMP_REDIRECT_URL
-              value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/login.htm
+              value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/login.htm
             - name: VID_ECOMP_REST_URL
-              value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/auxapi
+              value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/auxapi
             - name: VID_CONTACT_US_LINK
               value: "{{ .Values.config.vidcontactuslink }}"
             - name: VID_UEB_URL_LIST