Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[SO] Cleanup of SO charts
[oom.git]
/
kubernetes
/
so
/
components
/
so-bpmn-infra
/
resources
/
config
/
overrides
/
override.yaml
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
9feab4d
..
8e002e1
100755
(executable)
--- a/
kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@
-14,14
+14,10
@@
# limitations under the License.
*/}}
aai:
# 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 )
}}
+ auth: {{
.Values.aai.auth
}}
dme2:
timeout: '30000'
dme2:
timeout: '30000'
- {{ if (include "common.needTLS" .) }}
- endpoint: https://aai.{{ include "common.namespace" . }}:8443
- {{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
- {{ end }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
workflowAaiDistributionDelay: PT30S
pnfEntryNotificationTimeout: P14D
cds:
workflowAaiDistributionDelay: PT30S
pnfEntryNotificationTimeout: P14D
cds:
@@
-65,18
+61,19
@@
mso:
correlation:
timeout: 60
logPath: logs
correlation:
timeout: 60
logPath: logs
- config:
- cadi: {{ include "so.cadi.keys" . | nindent 8}}
async:
core-pool-size: 50
max-pool-size: 50
queue-capacity: 500
adapters:
async:
core-pool-size: 50
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:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
completemsoprocess:
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/CompleteMsoProcess
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
- auth: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.adapters.requestDb.auth )
}}
+ auth: {{
.Values.mso.adapters.requestDb.auth
}}
db:
auth: {{ .Values.mso.adapters.db.auth }}
password: {{ .Values.mso.adapters.db.password }}
db:
auth: {{ .Values.mso.adapters.db.auth }}
password: {{ .Values.mso.adapters.db.password }}
@@
-128,7
+125,7
@@
mso:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
- auth: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )
}}
+ auth: {{
.Values.mso.adapters.requestDb.auth
}}
default:
adapter:
namespace: http://org.onap.mso
default:
adapter:
namespace: http://org.onap.mso
@@
-162,11
+159,7
@@
mso:
oof:
auth: {{ .Values.mso.oof.auth }}
callbackEndpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
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
endpoint: http://oof-osdf.{{ include "common.namespace" . }}:8698
- {{ end }}
timeout: PT30M
workflow:
CreateGenericVNFV1:
timeout: PT30M
workflow:
CreateGenericVNFV1:
@@
-355,6
+348,9
@@
sniro:
headers.minorVersion: 1
headers.latestVersion: 2
server:
headers.minorVersion: 1
headers.latestVersion: 2
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50