Merge "PEP8 for ready.py and job_complete.py script"

[oom.git] / kubernetes / nbi / templates / deployment.yaml

diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index a7be329..889e25e 100644 (file)
--- a/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
             - name: ONAP_CLOUDOWNER
               value: {{ .Values.config.cloudOwner }}
             - name: NBI_URL
-              value: "http://nbi.{{ include "common.namespace" . }}:8080/nbi/api/v3"
+              value: "http://nbi.{{ include "common.namespace" . }}:8080/nbi/api/v4"
             - name: SDC_HOST
               value: "http://sdc-be.{{ include "common.namespace" . }}:8080"
             - name: SDC_HEADER_ECOMPINSTANCEID
@@ -92,6 +92,8 @@ spec:
             - name: SO_HEADER_AUTHORIZATION
               value: {{ .Values.so_authorization }}
             {{- end }}
+            - name: DMAAP_HOST
+              value: "http://message-router.{{ include "common.namespace" . }}:3904"
             - name: LOGGING_LEVEL_ORG_ONAP_NBI
               value: {{ .Values.config.loglevel }}
             - name: MSB_ENABLED
@@ -105,7 +107,7 @@ spec:
               name: localtime
               readOnly: true
           resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}