Merge "default storageclass and nfs provisioner"

[oom.git] / kubernetes / oof / charts / oof-cmso / charts / oof-cmso-service / templates / deployment.yaml

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
index 47f732a..350708f 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2018 AT&T
+# Copyright (c) 2018 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ spec:
         name: {{ include "common.name" . }}-readiness
       - name: db-init
         image: "{{ include "common.repository" . }}/{{ .Values.dbinit.image }}"
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DB_HOST
           value: {{ .Values.config.db_host }}.{{.Release.Namespace}}
@@ -86,6 +86,10 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name}}-cmso-db
               key: user-password
+        - name: OPTIMIZER_HOST
+          value: {{ .Values.config.optimizer_host }}.{{.Release.Namespace}}
+        - name: OPTIMIZER_PORT
+          value: {{ .Values.config.optimizer_port | quote}}
         ports:
         - containerPort: {{ .Values.service.internalPort }}
         # disable liveness probe when breakpoints set in debugger
@@ -128,6 +132,8 @@ spec:
               path: logback.xml
             - key: cmso.properties
               path: cmso.properties
+            - key: cadi.properties
+              path: cadi.properties
             - key: optimizer.properties
               path: optimizer.properties
             - key: ticketmgt.properties