[MODELING]Add environment variables in OOM chart

Issue-ID: MODELING-441
Change-Id: Ibcabdb9db6f9d0695f2c338a9f7d52b42f6d0723
Signed-off-by: dengyh <dengyuanhong@chinamobile.com>

diff --git a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
index bdcd050..347d794 100644 (file)
--- a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
@@ -84,12 +84,18 @@ spec:
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           env:
-          - name: MSB_ADDR
-            value: "{{ .Values.config.msbProtocol }}://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}"
           - name: SSL_ENABLED
             value: "{{ .Values.config.ssl_enabled }}"
           - name: MSB_ENABLED
             value: "{{ .Values.config.msb_enabled }}"
+          - name: MSB_ADDR
+            value: "{{ .Values.config.msbProtocol }}://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}"
+          - name: SDC_ADDR
+            value: "{{ .Values.config.sdcProtocol }}://{{ .Values.config.sdcServiceName }}:{{ .Values.config.sdcPort }}"
+          - name: DMAAP_ENABLED
+            value: "{{ .Values.config.dmaap_enabled }}"
+          - name: DMAAP_ADDR
+            value: "{{ .Values.config.dmaapProtocol }}://{{ .Values.config.dmaapServiceName }}:{{ .Values.config.dmaapPort }}"
           - name: DB_IP
             value: "{{ include "common.mariadbService" . }}"
           - name: DB_PORT

diff --git a/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
index 9bc8aa0..9c910ba 100644 (file)
--- a/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
@@ -79,10 +79,18 @@ mariadb-init:
 config:
   #application configuration about  msb
   ssl_enabled: false
+  msb_enabled: false
   msbProtocol: https
   msbServiceName: msb-iag
   msbPort: 443
-  msb_enabled: true
+  sdcProtocol: https
+  sdcServiceName: sdc-be
+  sdcPort: 8443
+  dmaap_enabled: false
+  dmaapProtocol: https
+  dmaapServiceName: message-router-external
+  dmaapPort: 3905
+
   #application configuration user password about mariadb
   db:
     userName: etsicatalog
@@ -93,7 +101,7 @@ config:
 flavor: small
 
 repository: nexus3.onap.org:10001
-image: onap/modeling/etsicatalog:1.0.7
+image: onap/modeling/etsicatalog:1.0.8
 initImage: busybox:latest
 pullPolicy: Always