X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Ftemplates%2Fdeployment.yaml;h=5feb37415bdbb3fb6b658584f508b33d084820af;hb=a3589e313c7205754aecdc8e8430cb5459f20ef1;hp=88b3de35c007099ec1d94e1134f2881031a38d4e;hpb=c786a281b513f1cae7e6f8adbc1e0cb547aac75b;p=oom.git

diff --git a/kubernetes/policy/templates/deployment.yaml b/kubernetes/policy/templates/deployment.yaml
index 88b3de35c0..5feb37415b 100644
--- a/kubernetes/policy/templates/deployment.yaml
+++ b/kubernetes/policy/templates/deployment.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 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.
@@ -45,27 +46,16 @@ spec:
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
-      - command: ["/bin/bash", "-c", "echo $POD_IP > /config/ip_addr.txt"]
-        env:
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: status.podIP
-        volumeMounts:
-        - mountPath: /config/
-          name: pe
-        image: {{ .Values.global.ubuntuImage }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: generate-ip-addr-txt
       containers:
         - command:
           - /bin/bash
           - ./do-start.sh
           - pap
           name: {{ include "common.name" . }}
-          image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          resources:
+{{ include "common.resources" . | indent 12 }}
           ports:
           - containerPort: {{ .Values.service.externalPort }}
           - containerPort: {{ .Values.service.externalPort2 }}
@@ -88,11 +78,30 @@ spec:
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
+          - mountPath: /tmp/policy-install/config/push-policies.sh
+            name: pe-pap
+            subPath: push-policies.sh
+          - mountPath: /tmp/policy-install/config/pap-tweaks.sh
+            name: pe-pap
+            subPath: pap-tweaks.sh
+          - mountPath: /tmp/policy-install/config/paplp.conf
+            name: pe-pap
+            subPath: paplp.conf
+          - mountPath: /tmp/policy-install/config/pap.conf
+            name: pe-pap
+            subPath: pap.conf
+          - mountPath: /tmp/policy-install/config/mysql.conf
+            name: pe-pap
+            subPath: mysql.conf
+          - mountPath: /tmp/policy-install/config/elk.conf
+            name: pe-pap
+            subPath: elk.conf
+          - mountPath: /tmp/policy-install/config/console.conf
+            name: pe-pap
+            subPath: console.conf
           - mountPath: /tmp/policy-install/config/base.conf
             name: pe
             subPath: base.conf
-          - mountPath: /tmp/policy-install/config/
-            name: pe-pap
           - mountPath: /tmp/policy-install/do-start.sh
             name: pe-scripts
             subPath: do-start.sh
@@ -109,7 +118,7 @@ spec:
               exec:
                 command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/opt/app/policy/servers/pap/webapps/pap/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; export SRC=/tmp/policy-install/logback.xml; export DST=/opt/app/policy/servers/console/webapps/onap/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
         - image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.global.loggingImage | default .Values.loggingImage }}"
-          imagePullPolicy: {{ .Values.pullPolicy }}
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           name: filebeat-onap
           volumeMounts:
           - mountPath: /usr/share/filebeat/filebeat.yml
@@ -119,16 +128,6 @@ spec:
             name: policy-logs
           - mountPath: /usr/share/filebeat/data
             name: policy-data-filebeat
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-        {{- if .Values.nodeSelector }}
-        nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 10 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-        affinity:
-{{ toYaml .Values.affinity | indent 10 }}
-        {{- end }}
       volumes:
         - name: localtime
           hostPath: