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=9feab4ddce0ece9a7b6764cf81f2853b13e9be6c;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=c64e10597a9798563eb270a7005268b9778b196d;hpb=2c01fdf6aa282fbdae79de83b372302ec51d092b;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 c64e10597a..9feab4ddce 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" . }}:8080
+  {{ 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:
@@ -113,9 +121,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 +162,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 +294,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: