Add aai and mso FQDN in drools /etc/hosts

[oom.git] / kubernetes / policy / templates / dep-drools.yaml

diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index 7da046e..1558b65 100644 (file)
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyDrools }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -20,13 +21,7 @@ spec:
                   "--container-name",
                   "mariadb",
                   "--container-name",
-                  "nexus",
-                  "--container-name",
-                  "pap",
-                  "--container-name",
-                  "pdp",
-                  "--container-name",
-                  "brmsgw"
+                  "nexus"
               ],
               "command": [
                   "/root/ready.py"
@@ -48,37 +43,68 @@ spec:
           }
           ]'
     spec:
+      hostAliases:
+      - ip: "{{ .Values.aaiServiceClusterIp }}"
+        hostnames:
+        - "aai.api.simpledemo.openecomp.org"
       containers:
-      - command:
-        - /bin/bash
-        - -c
-        - ./do-start.sh
-        image: "{{ .Values.image.policyDrools }}:{{ .Values.image.policyDroolsVersion }}"
+      - image: "{{ .Values.image.policyDrools }}:{{ .Values.image.policyDroolsVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: drools
         ports:
         - containerPort: 6969
+        - containerPort: 9696
         readinessProbe:
           tcpSocket:
             port: 6969
           initialDelaySeconds: 5
           periodSeconds: 10
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /tmp/policy-install/config
           name: drools
-        - mountPath: /tmp/policy-install/config/policy-keystore
-          name: drools-keystore
         - mountPath: /usr/share/maven/conf/settings.xml
           name: drools-settingsxml
+        - mountPath: /var/log/onap
+          name: policy-logs
+        - mountPath: /tmp/logback.xml
+          name: policy-logback
+        lifecycle:
+          postStart:
+            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"]
+      - image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: filebeat-onap
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: policy-logs
+        - mountPath: /usr/share/filebeat/data
+          name: policy-data-filebeat
       volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+        - name: policy-logs
+          emptyDir: {}
+        - name: policy-data-filebeat
+          emptyDir: {}
+        - name: policy-logback
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/drools/logback.xml
         - name: drools-settingsxml
           hostPath:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/drools/settings.xml
         - name: drools
           hostPath:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/drools/
-        - name: drools-keystore
-          secret:
-            secretName: secret-{{ .Values.nsPrefix }}-policy
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file