Merge "Consistent naming for vid deployment"

diff --combined kubernetes/vid/templates/deployment.yaml
index 46e86df,24cce14..a236754
--- 1/kubernetes/vid/templates/deployment.yaml
--- 2/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@@ -35,7 -35,7 +35,7 @@@ spec
          - /root/job_complete.py
          args:
          - --job-name
-         - vid-config-galera
+         - {{ include "common.fullname" . }}-galera-config
          env:
          - name: NAMESPACE
            valueFrom:
@@@ -87,11 -87,9 +87,11 @@@
              - name: MSO_DME2_ENABLED
                value: {{ .Values.global.debugEnabled | default .Values.debugEnabled | quote }}
              - name: VID_ECOMP_REDIRECT_URL
 -              value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/login.htm
 +              value: https://{{ .Values.config.portalhost }}:{{ .Values.config.onapport }}/ONAPPORTAL/login.htm
              - name: VID_ECOMP_REST_URL
 -              value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/auxapi
 +              value: https://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapportrest }}/ONAPPORTAL/auxapi
 +            - name: VID_ROLE_ACCESS_CENTRALIZED
 +              value: "{{ .Values.config.roleaccesscentralized }}"
              - name: VID_CONTACT_US_LINK
                value: "{{ .Values.config.vidcontactuslink }}"
              - name: VID_UEB_URL_LIST