Merge "Migrate OOF to v14 AAI schema"

[oom.git] / kubernetes / policy / charts / drools / templates / statefulset.yaml

diff --git a/kubernetes/policy/charts/drools/templates/statefulset.yaml b/kubernetes/policy/charts/drools/templates/statefulset.yaml
index 9041478..6564e79 100644 (file)
--- a/kubernetes/policy/charts/drools/templates/statefulset.yaml
+++ b/kubernetes/policy/charts/drools/templates/statefulset.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.
@@ -51,10 +52,6 @@ spec:
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
-      hostAliases:
-      - ip: "{{ .Values.config.aaiServiceClusterIp }}"
-        hostnames:
-        - "aai.api.simpledemo.openecomp.org"
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -88,6 +85,9 @@ spec:
           - mountPath: /tmp/policy-install/config/feature-healthcheck.conf
             name: drools-secret
             subPath: feature-healthcheck.conf
+          - mountPath: /tmp/policy-install/config/feature-pooling-dmaap.conf
+            name: drools-config
+            subPath: feature-pooling-dmaap.conf
           - mountPath: /tmp/policy-install/config/base.conf
             name: drools-config
             subPath: base.conf
@@ -116,7 +116,7 @@ spec:
               exec:
                 command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/opt/app/policy/config/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         - image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.loggingImage }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
@@ -160,6 +160,9 @@ spec:
             - key: base.conf
               path: base.conf
               mode: 0755
+            - key: feature-pooling-dmaap.conf
+              path: feature-pooling-dmaap.conf
+              mode: 0755
             - key: policy-management.conf
               path: policy-management.conf
               mode: 0755