X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foof%2Fcomponents%2Foof-cmso%2Fcomponents%2Foof-cmso-service%2Ftemplates%2Fdeployment.yaml;h=d82040b17b6ad5248f411e8144726378212020cf;hb=07efa9bb787a6a04dfb9771a3940b3461d247d20;hp=27d52a24ba39290b84db4df98b8670297d706408;hpb=103b679fffc112f20cd8a4aa3fb5bc0113890ef1;p=oom.git

diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
index 27d52a24ba..d82040b17b 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
         - /app/ready.py
         args:
         - --container-name
-        - {{ .Values.config.db.container }}
+        - {{ include "common.mariadbService" . }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -77,9 +77,9 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DB_HOST
-          value: {{ .Values.config.db.host }}.{{.Release.Namespace}}
+          value: {{ include "common.mariadbService" . }}.{{.Release.Namespace}}
         - name: DB_PORT
-          value: {{ .Values.config.db.port | quote}}
+          value: {{ include "common.mariadbPort" . | quote}}
         - name: DB_USERNAME
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-db-user-secret" "key" "login") | indent 10}}
         - name: DB_SCHEMA
@@ -107,25 +107,15 @@ spec:
         - mountPath: /usr/share/filebeat/data
           name: {{ include "common.fullname" . }}-filebeat
         resources:
-{{ include "common.resources" . }}
-      - name: mso-simulator
-        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.robotimage }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        volumeMounts:
-        - name: {{ include "common.fullname" . }}-config
-          mountPath: /share/etc/config
-        ports:
-        - containerPort: 5000
-        resources:
 {{ include "common.resources" . }}
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DB_HOST
-          value: {{ .Values.config.db.host }}.{{.Release.Namespace}}
+          value: {{ include "common.mariadbService" . }}.{{.Release.Namespace}}
         - name: DB_PORT
-          value: {{ .Values.config.db.port | quote}}
+          value: {{ include "common.mariadbPort" . | quote}}
         - name: DB_USERNAME
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-db-user-secret" "key" "login") | indent 10}}
         - name: DB_SCHEMA
@@ -140,6 +130,12 @@ spec:
           value: {{ .Values.global.truststorePassword }}
         - name: AUTHENTICATION
           value: {{ .Values.global.authentication }}
+        - name: AAF_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-aaf-creds" "key" "login") | indent 10}}
+        - name: AAF_PASSWORD
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-aaf-creds" "key" "password") | indent 10}}
+        - name: VM_ARGS
+          value: "-Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/share/etc/config"
         command:
         - /bin/sh
         args: