diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/main/resources/application.yaml | 65 | ||||
| -rw-r--r-- | main/src/test/resources/application-test-e2e.yaml | 5 | ||||
| -rw-r--r-- | main/src/test/resources/application-test.yaml | 2 |
3 files changed, 31 insertions, 41 deletions
diff --git a/main/src/main/resources/application.yaml b/main/src/main/resources/application.yaml index 530f8457..39fcaadb 100644 --- a/main/src/main/resources/application.yaml +++ b/main/src/main/resources/application.yaml @@ -4,8 +4,8 @@ spring: name: policyadmin password: zb!XztG34 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: @@ -22,6 +22,9 @@ server: port: 6969 servlet: context-path: /policy/pap/v1 + ssl: + enabled: false + pap: name: PapGroup topic: @@ -38,47 +41,39 @@ pap: maxWaitMs: 30000 topicParameterGroup: topicSources: - - topic: ${pap.topic.pdp-pap.name} - servers: - - kafka - topicCommInfrastructure: NOOP - fetchTimeout: 15000 - - topic: ${pap.topic.heartbeat.name} - effectiveTopic: ${pap.topic.pdp-pap.name} - consumerGroup: policy-pap - servers: - - kafka - topicCommInfrastructure: NOOP - fetchTimeout: 15000 + - topic: ${pap.topic.pdp-pap.name} + servers: + - noop + topicCommInfrastructure: noop + useHttps: false + fetchTimeout: 15000 + - topic: ${pap.topic.heartbeat.name} + effectiveTopic: ${pap.topic.pdp-pap.name} + consumerGroup: policy-pap + servers: + - noop + topicCommInfrastructure: noop + useHttps: false + fetchTimeout: 15000 topicSinks: - - topic: ${pap.topic.pdp-pap.name} - servers: - - kafka - topicCommInfrastructure: NOOP - - topic: ${pap.topic.notification.name} - servers: - - kafka - topicCommInfrastructure: NOOP + - topic: ${pap.topic.pdp-pap.name} + servers: + - noop + topicCommInfrastructure: noop + useHttps: false + - topic: ${pap.topic.notification.name} + servers: + - noop + topicCommInfrastructure: noop + useHttps: false healthCheckRestClientParameters: - clientName: api hostname: policy-api port: 6969 userName: policyadmin password: zb!XztG34 - useHttps: true + useHttps: false basePath: policy/api/v1/healthcheck - - clientName: distribution - hostname: policy-distribution - port: 6969 - userName: healthcheck - password: zb!XztG34 - useHttps: true - basePath: healthcheck - - clientName: kafka - hostname: kafka - port: 3905 - useHttps: true - basePath: topics management: endpoints: diff --git a/main/src/test/resources/application-test-e2e.yaml b/main/src/test/resources/application-test-e2e.yaml index 14495361..9d3d77ec 100644 --- a/main/src/test/resources/application-test-e2e.yaml +++ b/main/src/test/resources/application-test-e2e.yaml @@ -61,8 +61,3 @@ pap: password: zb!XztG34 useHttps: true basePath: healthcheck - - clientName: kafka - hostname: kafka - port: 3905 - useHttps: true - basePath: topics diff --git a/main/src/test/resources/application-test.yaml b/main/src/test/resources/application-test.yaml index 82da86fe..88fee633 100644 --- a/main/src/test/resources/application-test.yaml +++ b/main/src/test/resources/application-test.yaml @@ -8,4 +8,4 @@ spring: naming: physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy - open-in-view: false
\ No newline at end of file + open-in-view: false |