[POLICY] new image versions

- Changes needed to support the new images.
- Add resources to galera config job (POLICY-2820)

Issue-ID: POLICY-2789
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Id3b87a5931c64f729afcf77861d12fd5e25a5531
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

2 files changed, 4 insertions, 0 deletions

diff --git a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
index 184ae9aee7..a0f5ceb777 100755
--- a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
@@ -57,6 +57,7 @@ PDPD_CONFIGURATION_PARTITION_KEY=
 
 POLICY_PDP_PAP_TOPIC=POLICY-PDP-PAP
 POLICY_PDP_PAP_GROUP=defaultGroup
+POLICY_PDP_PAP_POLICYTYPES=onap.policies.controlloop.operational.common.Drools
 
 # Symmetric Key for encoded sensitive data
 
diff --git a/kubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf b/kubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf
index bb2b90c1a7..17efdbc44e 100755
--- a/kubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf
@@ -16,7 +16,10 @@
 #  SPDX-License-Identifier: Apache-2.0
 #  ============LICENSE_END=========================================================
 
+{{- if not .Values.global.aafEnabled }}
 KEYSTORE_PASSWD={{.Values.keystore.password}}
+{{- end }}
+
 TRUSTSTORE_PASSWD={{.Values.truststore.password}}
 
 TELEMETRY_USER={{.Values.telemetry.user}}