X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-bpmn-infra%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=360936d2ba70550fa00fbc2a4118e1ebab2f249b;hb=31bb6fe2a093273e4a10cd0c46adfae75f736cd6;hp=4429bd9f4646583ae1b7481dfdfe3e05b6f248d7;hpb=2544d29e156ad8b7e0036aa434273d2ea83c7804;p=oom.git

diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index 4429bd9f46..360936d2ba 100755
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2018 AT&T USA
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
 # 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.
+*/}}
 aai:
   auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
   dme2:
@@ -32,6 +34,10 @@ camunda:
     job-execution:
       max-pool-size: 30
       core-pool-size: 3
+    generic-properties:
+      properties:
+        sunday-history-cleanup-batch-window-start-time: {{ quote .Values.camunda.sundayCleanupWindowStartTime }}
+        sunday-history-cleanup-batch-window-end-time: {{ quote .Values.camunda.sundayCleanupWindowEndTime }}
 entitymanager:
   packagesToScan: com
 pnf:
@@ -92,7 +98,7 @@ mso:
     vnf:
       endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAdapter
       rest:
-        endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/vnfs
+        endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/{{ .Values.vnf.api.version }}/vnfs
     volume-groups:
       rest:
         endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/volume-groups
@@ -100,7 +106,7 @@ mso:
       endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAsync
     vfc:
       rest:
-        endpoint: http://so-vfc-adapter.{{ include "common.namespace" . }}:8084/services/v1/vfcadapter
+        endpoint: http://so-etsi-sol005-adapter.{{ include "common.namespace" . }}:8084/services/v1/vfcadapter
     workflow:
       message:
         endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
@@ -111,9 +117,6 @@ mso:
       timeout: PT5M
       callback:
         endpoint: http://so-oof-adapter.{{ include "common.namespace" . }}:8090/so/adapters/oof/callback/v1
-  bpmn:
-    process:
-      historyTimeToLive: '30'
   callbackRetryAttempts: '5'
   catalog:
     db:
@@ -283,6 +286,7 @@ mso:
   naming:
     endpoint: http://naming.demo.onap.com:8081/web/service/v1/genNetworkElementName
     auth: Basic bTA0NzY4QG5vbi1wcm9kLm1zby5lY29tcC5hdHQuY29tOkF0dG0wNDc2OExpZmUhQA==
+  bpmn-history-ttl: {{ .Values.bpmn.historyTTL }}
 policy:
   auth: Basic dGVzdHBkcDphbHBoYTEyMw==
   default:
@@ -301,6 +305,10 @@ sdnc:
   dmaap:
     host: http://message-router.{{ include "common.namespace" . }}:3904
     timeout: 30000
+    publisher:
+      topic: RAN-Slice-Mgmt
+    callback:
+      timeout: PT5M
   lcm:
     path: '/restconf/operations/LCM:'
     actionTimeout: 300000
@@ -380,8 +388,8 @@ spring:
 so:
   vnfm:
     adapter:
-      url: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1/
-      auth: {{ .Values.so.vnfm.adapter.auth }}
+      url: http://so-etsi-sol003-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
+      auth: {{ .Values.so.sol003.adapter.auth }}
 org:
   onap:
     so: