7 files changed, 10 insertions, 55 deletions
diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index a1c480458d..5c5f683e88 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -45,6 +45,9 @@ spec:
   - name: "drools-port"
     port: 6969
     nodePort: {{ .Values.nodePortPrefix }}17
+  - name: "drools-port2"
+    port: 9696
+    nodePort: {{ .Values.nodePortPrefix }}21
   selector:
     app: drools
   type: NodePort
diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml
index 7a1bcdec49..89752aece7 100644
--- a/kubernetes/policy/templates/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -20,13 +20,7 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - mariadb
-        - --container-name
-        - nexus
-        - --container-name
         - pap
-        - --container-name
-        - pdp
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index 48ef16e3b2..83179fafc9 100644
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -23,12 +23,6 @@ spec:
         - mariadb
         - --container-name
         - nexus
-        - --container-name
-        - pap
-        - --container-name
-        - pdp
-        - --container-name
-        - brmsgw
         env:
         - name: NAMESPACE
           valueFrom:
@@ -38,6 +32,10 @@ spec:
         image: "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: drools-readiness
+      hostAliases:
+      - ip: "{{ .Values.aaiServiceClusterIp }}"
+        hostnames:
+        - "aai.api.simpledemo.openecomp.org"
       containers:
       - command:
         - /bin/bash
diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml
index c0f5060884..c921e8c890 100644
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@ -24,8 +24,6 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /var/lib/mysql
-          name: policy-mariadb-data
         readinessProbe:
           tcpSocket:
             port: 3306
@@ -35,9 +33,6 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: policy-mariadb-data
-        persistentVolumeClaim:
-          claimName: policy-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}
 \ No newline at end of file
diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml
index 523cfd35ff..a19fd24778 100644
--- a/kubernetes/policy/templates/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -19,8 +19,6 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - nexus
-        - --container-name
         - mariadb
         env:
         - name: NAMESPACE
@@ -52,6 +50,9 @@ spec:
         image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: pap
+        env:
+        - name: PRELOAD_POLICIES
+          value: "true"
         ports:
         - containerPort: 8443
         - containerPort: 9091
diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml
index 3763b95bb2..1f66396a1c 100644
--- a/kubernetes/policy/templates/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -20,10 +20,6 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - mariadb
-        - --container-name
-        - nexus
-        - --container-name
         - pap
         env:
         - name: NAMESPACE
diff --git a/kubernetes/policy/templates/policy-pv-pvc.yaml b/kubernetes/policy/templates/policy-pv-pvc.yaml
deleted file mode 100644
index 5dc0c61c43..0000000000
--- a/kubernetes/policy/templates/policy-pv-pvc.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#{{ if not .Values.disablePolicyMariadb }}
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: "{{ .Values.nsPrefix }}-policy-db"
-  namespace: "{{ .Values.nsPrefix }}-policy"
-  labels:
-    name: "{{ .Values.nsPrefix }}-policy-db"
-spec:
-  capacity:
-    storage: 2Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/mariadb/data/
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: policy-db
-  namespace: "{{ .Values.nsPrefix }}-policy"
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 2Gi
-  selector:
-    matchLabels:
-      name: "{{ .Values.nsPrefix }}-policy-db"
-#{{ end }}
-\ No newline at end of file