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=77e553bd67176f33f44d4de5dd6d306556c65a25;hb=b3a380653c2b1604c6774aab561f20d471d574df;hp=11128dd68ccf7766c403d30e2b35641bdb52475f;hpb=0e328863f856ecb17e6e6d6d37882570811ed87e;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 11128dd68c..77e553bd67 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
@@ -17,7 +17,11 @@ aai:
   auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
   dme2:
     timeout: '30000'
+  {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
+  {{ else }}
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
+  {{ end }}
   workflowAaiDistributionDelay: PT30S
   pnfEntryNotificationTimeout: P14D
 cds:
@@ -34,6 +38,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:
@@ -64,6 +72,9 @@ mso:
     max-pool-size: 50
     queue-capacity: 500
   adapters:
+    apihandler:
+      endpoint: http://so.{{ include "common.namespace" . }}:8080
+      auth: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==
     completemsoprocess:
       endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/CompleteMsoProcess
     requestDb:
@@ -102,7 +113,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
@@ -113,9 +124,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:
@@ -157,7 +165,11 @@ mso:
   oof:
     auth: {{ .Values.mso.oof.auth }}
     callbackEndpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
+    {{ if (include "common.needTLS" .) }}
     endpoint: https://oof-osdf.{{ include "common.namespace" . }}:8698
+    {{ else }}
+    endpoint: http://oof-osdf.{{ include "common.namespace" . }}:8698
+    {{ end }}
     timeout: PT30M
   workflow:
     CreateGenericVNFV1:
@@ -285,6 +297,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:
@@ -303,6 +316,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
@@ -341,6 +358,9 @@ sniro:
     headers.minorVersion: 1
     headers.latestVersion: 2
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
@@ -382,8 +402,8 @@ spring:
 so:
   vnfm:
     adapter:
-      url: http://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: