2 files changed, 23 insertions, 91 deletions
diff --git a/compose/config/pap/papParameters.yaml b/compose/config/pap/papParameters.yaml
index 51aaec38..57b540bb 100644
--- a/compose/config/pap/papParameters.yaml
+++ b/compose/config/pap/papParameters.yaml
@@ -7,8 +7,8 @@ spring:
     converters:
       preferred-json-mapper: gson
   datasource:
-    url: jdbc:mariadb://mariadb:3306/policyadmin
-    driverClassName: org.mariadb.jdbc.Driver
+    url: jdbc:postgresql://postgres:5432/policyadmin
+    driverClassName: org.postgresql.Driver
     username: policy_user
     password: policy_user
   jpa:
@@ -27,7 +27,6 @@ server:
 
 pap:
   name: PapGroup
-  aaf: false
   topic:
     pdp-pap.name: policy-pdp-pap
     notification.name: policy-notification
@@ -86,3 +85,24 @@ management:
       path-mapping:
         -metrics: plain-metrics
         -prometheus: metrics
+
+---
+
+spring:
+  config:
+    activate:
+      on-profile: mariadb
+  datasource:
+    url: jdbc:mariadb://mariadb:3306/policyadmin
+    driverClassName: org.mariadb.jdbc.Driver
+    username: policy_user
+    password: policy_user
+
+database:
+  name: PolicyProviderParameterGroup
+  implementation: org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl
+  driver: org.mariadb.jdbc.Driver
+  url: jdbc:mariadb://mariadb:3306/policyadmin
+  user: policy_user
+  password: policy_user
+  persistenceUnit: PolicyDb
diff --git a/compose/config/pap/papParametersPostgres.yaml b/compose/config/pap/papParametersPostgres.yaml
deleted file mode 100644
index 30ef7751..00000000
--- a/compose/config/pap/papParametersPostgres.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-spring:
-  security:
-    user:
-      name: policyadmin
-      password: zb!XztG34
-  http:
-    converters:
-      preferred-json-mapper: gson
-  datasource:
-    url: jdbc:postgresql://postgres:5432/policyadmin
-    driverClassName: org.postgresql.Driver
-    username: policy_user
-    password: policy_user
-  jpa:
-    hibernate:
-      ddl-auto: none
-      naming:
-        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-        implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-
-server:
-  port: 6969
-  servlet:
-    context-path: /policy/pap/v1
-  ssl:
-    enabled: false
-
-pap:
-  name: PapGroup
-  aaf: false
-  topic:
-    pdp-pap.name: policy-pdp-pap
-    notification.name: policy-notification
-    heartbeat.name: policy-heartbeat
-  pdpParameters:
-    heartBeatMs: 120000
-    updateParameters:
-      maxRetryCount: 1
-      maxWaitMs: 30000
-    stateChangeParameters:
-      maxRetryCount: 1
-      maxWaitMs: 30000
-  savePdpStatisticsInDb: true
-  topicParameterGroup:
-    topicSources:
-    - topic: ${pap.topic.pdp-pap.name}
-      servers:
-      - kafka:9092
-      topicCommInfrastructure: kafka
-      useHttps: false
-      fetchTimeout: 15000
-    - topic: ${pap.topic.heartbeat.name}
-      effectiveTopic: ${pap.topic.pdp-pap.name}
-      consumerGroup: policy-pap
-      servers:
-      - kafka:9092
-      topicCommInfrastructure: kafka
-      useHttps: false
-      fetchTimeout: 15000
-    topicSinks:
-    - topic: ${pap.topic.pdp-pap.name}
-      servers:
-      - kafka:9092
-      topicCommInfrastructure: kafka
-      useHttps: false
-    - topic: ${pap.topic.notification.name}
-      servers:
-      - kafka:9092
-      topicCommInfrastructure: kafka
-      useHttps: false
-  healthCheckRestClientParameters:
-  - clientName: api
-    hostname: policy-api
-    port: 6969
-    userName: policyadmin
-    password: zb!XztG34
-    useHttps: false
-    basePath: policy/api/v1/healthcheck
-
-management:
-  endpoints:
-    web:
-      base-path: /
-      exposure:
-        include: health, metrics, prometheus
-      path-mapping:
-        -metrics: plain-metrics
-        -prometheus: metrics