diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-07-30 08:19:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-07-30 08:19:20 +0000 |
| commit | bd7eceb7a0729a4a50b200be3764775bdc9d8141 (patch) | |
| tree | d6bb87ed1d6a51feb960f59bd1ee366a574a70b3 /kubernetes/policy/charts/policy-pap/resources | |
| parent | e911730e3dda95859850da7859d4863f739b8e2b (diff) | |
| parent | 9f8f792363c12df8f35e74ac9d94cb7f39ef4752 (diff) | |
Merge "OOM companion changes to topic.properties removal" into staging
Diffstat (limited to 'kubernetes/policy/charts/policy-pap/resources')
| -rw-r--r-- | kubernetes/policy/charts/policy-pap/resources/config/config.json | 13 | ||||
| -rw-r--r-- | kubernetes/policy/charts/policy-pap/resources/config/topic.properties | 22 |
2 files changed, 13 insertions, 22 deletions
diff --git a/kubernetes/policy/charts/policy-pap/resources/config/config.json b/kubernetes/policy/charts/policy-pap/resources/config/config.json index fa80bf2190..3f33ed95a0 100644 --- a/kubernetes/policy/charts/policy-pap/resources/config/config.json +++ b/kubernetes/policy/charts/policy-pap/resources/config/config.json @@ -26,6 +26,7 @@ "aaf": false }, "pdpParameters": { + "heartBeatMs": 120000, "updateParameters": { "maxRetryCount": 1, "maxWaitMs": 30000 @@ -43,5 +44,17 @@ "databaseUser": "policy_user", "databasePassword": "cG9saWN5X3VzZXI=", "persistenceUnit": "PolicyMariaDb" + }, + "topicParameterGroup": { + "topicSources" : [{ + "topic" : "POLICY-PDP-PAP", + "servers" : [ "message-router" ], + "topicCommInfrastructure" : "dmaap" + }], + "topicSinks" : [{ + "topic" : "POLICY-PDP-PAP", + "servers" : [ "message-router" ], + "topicCommInfrastructure" : "dmaap" + }] } } diff --git a/kubernetes/policy/charts/policy-pap/resources/config/topic.properties b/kubernetes/policy/charts/policy-pap/resources/config/topic.properties deleted file mode 100644 index c1124a1172..0000000000 --- a/kubernetes/policy/charts/policy-pap/resources/config/topic.properties +++ /dev/null @@ -1,22 +0,0 @@ -# ============LICENSE_START======================================================= -# ONAP PAP -# ================================================================================ -# Copyright (C) 2019 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= - -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 |