From: yangyan <yangyanyj@chinamobile.com>
Date: Fri, 13 Apr 2018 04:16:40 +0000 (+0800)
Subject: Update vfc charts configutation
X-Git-Tag: 2.0.0-ONAP~235^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1c0529987d19b596b44caf2071e121e3e3d2daea;p=oom.git

Update vfc charts configutation

Change-Id: I79dc1c5d26692fe675ca4cf2779fc78eac557a45
Issue-ID: VFC-879
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
index ba33ec587d..287f0a7d3e 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
@@ -69,6 +69,10 @@ spec:
           env:
             - name: MSB_ADDR
               value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+            - name: VES_ADDR
+              value: "{{ .Values.config.vescollectorServiceName }}:{{ .Values.config.vescollectorPort }}"
+            - name: VES_AUTHINFO
+              value: "{{ .Values.config.vescollectorUser }}:{{ .Values.config.vescollectorPassword }}"
           resources:
 {{ toYaml .Values.resources | indent 12 }}
         {{- if .Values.nodeSelector }}
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/values.yaml b/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
index d73a72b17b..c44fc75b0c 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
@@ -35,7 +35,11 @@ pullPolicy: Always
 debugEnabled: false
 
 # application configuration
-config: {}
+config:
+  vescollectorServiceName: dcae-ves-collector
+  vescollectorPort: 8080
+  vescollectorUser: ""
+  vescollectorPassword: ""
 
 # default number of instances
 replicaCount: 1
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
index eed1906d26..28b5950b48 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
@@ -52,6 +52,7 @@ spec:
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
+          - containerPort: {{ .Values.service.internalPort2 }}
           # disable liveness probe when breakpoints set in debugger
           # so K8s doesn't restart unresponsive container
           {{ if .Values.liveness.enabled }}