summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-openstack-adapter/resources/config/overrides
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-02-23 09:17:36 +0100
committerAndreas Geissler <andreas-geissler@telekom.de>2023-03-06 09:12:17 +0100
commitad61ccf6cccbe9a9637ef97eb98cee8dd70dce11 (patch)
treeec44004f8807bcb7229b1452a78bd31d2ff78c16 /kubernetes/so/components/so-openstack-adapter/resources/config/overrides
parent5583c3cd4f0b6d6be561af051c9f0466502c10fe (diff)
[SO] Cleanup of SO charts
Remove AAF and TLS related chart entries Use OOM templates for deployment and service definitions Remove so-appc-orchestrator, as it is not supported anymore Issue-ID: OOM-3106 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: I6256aa0fbbe172752cc3d8f83edde0880de7f629
Diffstat (limited to 'kubernetes/so/components/so-openstack-adapter/resources/config/overrides')
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml20
1 files changed, 6 insertions, 14 deletions
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 7dc22c3536..55d9ca2b1d 100755
--- 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,12 +14,8 @@
# 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 )}}
- {{ if (include "common.needTLS" .) }}
- endpoint: https://aai.{{ include "common.namespace" . }}:8443
- {{ else }}
+ auth: {{ .Values.aai.auth }}
endpoint: http://aai.{{ include "common.namespace" . }}:80
- {{ end }}
server:
{{- if include "common.onServiceMesh" . }}
forward-headers-strategy: none
@@ -72,7 +68,7 @@ org:
{{- end }}
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
@@ -83,7 +79,7 @@ org:
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
@@ -117,8 +113,8 @@ mso:
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
msb-port: 80
@@ -127,18 +123,14 @@ mso:
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 }}
- {{- end }}
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