summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-04-16 19:58:04 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-16 19:58:04 +0000
commit3004a085973288456e15518364172b0a5b8295b3 (patch)
tree5907211b4462beebb867d18246a8adc6ee21ebf6 /kubernetes
parenta6ee34ed3a655541a4cac72c15dc7a9ee57a0ccc (diff)
parentbb49cf9721e659433198937fdbf76bd8a6bd3d74 (diff)
Merge "VID Health Check fails"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/vid/templates/deployment.yaml16
-rw-r--r--kubernetes/vid/values.yaml2
2 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 89ed734dfb..847e636fa8 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -71,19 +71,19 @@ spec:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: ASDC_CLIENT_REST_HOST
- value: sdc-be.{{ include "common.namespace" . }}-sdc
+ value: sdc-be.{{ include "common.namespace" . }}
- name: ASDC_CLIENT_REST_AUTH
value: "{{ .Values.config.asdcclientrestauth }}"
- name: ASDC_CLIENT_REST_PORT
value: "{{ .Values.config.asdcclientrestport }}"
- name: VID_AAI_HOST
- value: aai-service.{{ include "common.namespace" . }}-aai
+ value: aai-service.{{ include "common.namespace" . }}
- name: VID_AAI_PORT
value: "{{ .Values.config.vidaaiport }}"
- name: VID_ECOMP_SHARED_CONTEXT_REST_URL
- value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/context
+ value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/context
- name: VID_MSO_SERVER_URL
- value: http://mso.{{ include "common.namespace" . }}-mso:"{{ .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,15 +91,15 @@ spec:
- name: MSO_DME2_ENABLED
value: {{ .Values.global.debugEnabled | default .Values.debugEnabled | quote }}
- name: VID_ECOMP_REDIRECT_URL
- value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/login.h\tm
+ value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/login.htm
- name: VID_ECOMP_REST_URL
- value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/auxapi
+ value: http://portalapps.{{ include "common.namespace" . }}:"{{ .Values.config.onapport }}"/ONAPPORTAL/auxapi
- name: VID_CONTACT_US_LINK
value: "{{ .Values.config.vidcontactuslink }}"
- name: VID_UEB_URL_LIST
- value: dmaap.{{ include "common.namespace" . }}-message-router
+ value: dmaap.{{ include "common.namespace" . }}
- name: VID_MYSQL_HOST
- value: "{{ .Values.config.vidmysqlhost }}"
+ value: "{{ .Release.Name }}-{{ .Values.config.vidmysqlhost }}"
- name: VID_MYSQL_PORT
value: "{{ .Values.config.vidmysqlport }}"
- name: VID_MYSQL_DBNAME
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 4b377afaf8..ac68f2e9ad 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -56,7 +56,7 @@ config:
# subchart configuration
mariadb:
- nameOverride: vid-db
+ nameOverride: vid-mariadb
# default number of instances
replicaCount: 1