From ec1500962b7de7c69fbe47659896e7cb9608fcf7 Mon Sep 17 00:00:00 2001
From: ramverma <ram.krishna.verma@est.tech>
Date: Wed, 10 Apr 2019 11:35:30 +0000
Subject: Adding final dmaap & db configurations

Change-Id: I547f8a520d84d3593f90256fa91fc964c1d1e83c
Issue-ID: POLICY-1443
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
---
 .../src/main/resources/etc/defaultConfig.json                | 12 ++++++------
 .../src/main/resources/etc/topic.properties                  | 11 ++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'packages')

diff --git a/packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json
index 5e47f3a6..bdcabc40 100644
--- a/packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json
+++ b/packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json
@@ -11,19 +11,19 @@
     "pdpParameters": {
         "updateParameters": {
             "maxRetryCount": 1,
-            "maxWaitMs": 1
+            "maxWaitMs": 30000
         },
         "stateChangeParameters": {
             "maxRetryCount": 1,
-            "maxWaitMs": 1
+            "maxWaitMs": 30000
         }
     },
     "databaseProviderParameters": {
         "name": "PolicyProviderParameterGroup",
         "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl",
-        "databaseUrl": "jdbc:mariadb://127.0.0.1:3306/policy",
-        "databaseUser": "root",
-        "databasePassword": "cm9vdA==",
-        "persistenceUnit": "ToscaConceptMariaDBTest"
+        "databaseUrl": "jdbc:mariadb://policydb:3306/policy",
+        "databaseUser": "policy_user",
+        "databasePassword": "cG9saWN5X3VzZXI=",
+        "persistenceUnit": "PolicyMariaDb"
     }
 }
diff --git a/packages/policy-pap-tarball/src/main/resources/etc/topic.properties b/packages/policy-pap-tarball/src/main/resources/etc/topic.properties
index 2f3c711b..5d36bdb1 100644
--- a/packages/policy-pap-tarball/src/main/resources/etc/topic.properties
+++ b/packages/policy-pap-tarball/src/main/resources/etc/topic.properties
@@ -16,10 +16,7 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-
-# These will be filled with real values later
-
-noop.sink.topics=POLICY-PDP-PAP
-noop.sink.topics.POLICY-PDP-PAP.servers=anyserver
-noop.source.topics=POLICY-PDP-PAP
-noop.source.topics.POLICY-PDP-PAP.servers=anyserver
+dmaap.sink.topics=POLICY-PDP-PAP
+dmaap.sink.topics.POLICY-PDP-PAP.servers=message-router
+dmaap.source.topics=POLICY-PDP-PAP
+dmaap.source.topics.POLICY-PDP-PAP.servers=message-router
-- 
cgit 1.2.3-korg