summaryrefslogtreecommitdiffstats
path: root/packages/policy-pap-tarball/src/main
diff options
context:
space:
mode:
authorJorge Hernandez <jorge.hernandez-herrero@att.com>2019-04-10 17:31:38 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-10 17:31:38 +0000
commit84da2c8e05ff63163c4431284115c97b29ff1fae (patch)
tree005fb454bee99e7cadef2fffca21e793f452318d /packages/policy-pap-tarball/src/main
parentb793c0cedf08d44de56073d24256567f50dcd1c3 (diff)
parentec1500962b7de7c69fbe47659896e7cb9608fcf7 (diff)
Merge "Adding final dmaap & db configurations"
Diffstat (limited to 'packages/policy-pap-tarball/src/main')
-rw-r--r--packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json12
-rw-r--r--packages/policy-pap-tarball/src/main/resources/etc/topic.properties11
2 files changed, 10 insertions, 13 deletions
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