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-openstack-adapter
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
index
15f08bc
..
55d9ca2
100755
(executable)
--- a/
kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
@@
-14,10
+14,14
@@
# 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 )
}}
- endpoint: http
s://aai.{{ include "common.namespace" . }}:8443
+ auth: {{
.Values.aai.auth
}}
+ endpoint: http
://aai.{{ include "common.namespace" . }}:80
server:
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
port: {{ index .Values.containerPort }}
+SW port: {{ index .Values.containerPort }}
spring:
datasource:
hikari:
spring:
datasource:
hikari:
@@
-57,10
+61,14
@@
org:
onap:
so:
adapters:
onap:
so:
adapters:
+ {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }}
+ default_keystone_url_version: /v3
+ {{- else }}
default_keystone_url_version: /v2.0
default_keystone_url_version: /v2.0
+ {{- end }}
default_keystone_reg_ex: "/[vV][0-9]"
vnf:
default_keystone_reg_ex: "/[vV][0-9]"
vnf:
- bpelauth: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.org.onap.so.adapters.bpelauth )
}}
+ bpelauth: {{
.Values.org.onap.so.adapters.bpelauth
}}
checkRequiredParameters: true
addGetFilesOnVolumeReq: false
sockettimeout: 30
checkRequiredParameters: true
addGetFilesOnVolumeReq: false
sockettimeout: 30
@@
-71,7
+79,7
@@
org:
valet_enabled: false
fail_requests_on_valet_failure: false
network:
valet_enabled: false
fail_requests_on_valet_failure: false
network:
- bpelauth: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.org.onap.so.adapters.bpelauth )
}}
+ bpelauth: {{
.Values.org.onap.so.adapters.bpelauth
}}
sockettimeout: 5
connecttimeout: 5
retrycount: 5
sockettimeout: 5
connecttimeout: 5
retrycount: 5
@@
-79,7
+87,11
@@
org:
retrylist: 408,429,500,502,503,504,900
encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
tenant:
retrylist: 408,429,500,502,503,504,900
encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
tenant:
+ {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }}
+ default_keystone_url_version: /v3
+ {{- else }}
default_keystone_url_version: /v2.0
default_keystone_url_version: /v2.0
+ {{- end }}
default_keystone_reg_ex: "/[vV][0-9]"
default_tenant_description: Tenant
default_region_type: single
default_keystone_reg_ex: "/[vV][0-9]"
default_tenant_description: Tenant
default_region_type: single
@@
-101,28
+113,24
@@
mso:
adapters:
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
adapters:
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.db.auth )
}}
- auth: {{
include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.encrypted "value2" .Values.mso.auth )
}}
+ auth: {{
.Values.mso.db.auth
}}
+ auth: {{
.Values.mso.auth
}}
logPath: ./logs/openstack
msb-ip: msb-iag
logPath: ./logs/openstack
msb-ip: msb-iag
- msb-port:
443
- msb-scheme: http
s
+ msb-port:
80
+ msb-scheme: http
workflow:
endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine
msoKey: {{ .Values.mso.msoKey }}
config:
workflow:
endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine
msoKey: {{ .Values.mso.msoKey }}
config:
- {{ if eq .Values.global.security.aaf.enabled true }}
- cadi: {{ include "so.cadi.keys" . | nindent 8}}
- {{- else }}
cadi:
aafId: {{ .Values.mso.basicUser }}
cadi:
aafId: {{ .Values.mso.basicUser }}
- {{- end }}
catalog:
db:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
catalog:
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.encrypted "value2" .Values.mso.db.auth )
}}
+ auth: {{
.Values.mso.db.auth
}}
site-name: localDevEnv
async:
core-pool-size: 50
site-name: localDevEnv
async:
core-pool-size: 50