diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-05-29 11:58:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-29 11:58:46 +0000 |
| commit | 6c988d8ecf867cf1788f984120a380d386e95a9e (patch) | |
| tree | 167954f19d4f6dc5be924168584381e3795f379c /kubernetes/sdnc/templates/configmap.yaml | |
| parent | e14332541c971f4f158f22a93cbcd6dc2e74c6b9 (diff) | |
| parent | 305b209ee53c6b581ae0f0348d948366ecbf02b5 (diff) | |
Merge changes I9b3c7aab,Ia75ba66d,I66886290,I630154c4,I42bb5a88, ... into frankfurt
* changes:
[COMMON] Use common aaf template in elasticsearch
[PORTAL] Move portal subcharts to components
[SDNC] Use common aaf template in sdnc
[COMMON] Fix certInitializer to use proper global values
[DMAAP] Use common aaf template in dmaap-bc
[COMMON] Fix certInitializer
[COMMON] Override truststore in aaf_agent image
Diffstat (limited to 'kubernetes/sdnc/templates/configmap.yaml')
| -rw-r--r-- | kubernetes/sdnc/templates/configmap.yaml | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/kubernetes/sdnc/templates/configmap.yaml b/kubernetes/sdnc/templates/configmap.yaml index cd39425073..087ed30055 100644 --- a/kubernetes/sdnc/templates/configmap.yaml +++ b/kubernetes/sdnc/templates/configmap.yaml @@ -78,16 +78,3 @@ metadata: heritage: {{ .Release.Service }} data: {{ tpl (.Files.Get "resources/env.yaml") . | indent 2 }} - -{{ if .Values.global.aafEnabled }} -{{- if .Values.aafConfig.addconfig -}} ---- -apiVersion: v1 -kind: ConfigMap -{{- $suffix := "aaf-add-config" }} -metadata: {{- include "common.resourceMetadata" (dict "suffix" $suffix "dot" . )| nindent 2 }} -data: - aaf-add-config.sh: |- - cd /opt/app/osaaf/local && /opt/app/aaf_config/bin/agent.sh local showpass {{.Values.aafConfig.fqi}} {{ .Values.aafConfig.fqdn }} | grep cadi_keystore_password= | cut -d= -f 2 > {{ .Values.aafConfig.credsPath }}/.pass 2>&1 -{{- end -}} -{{- end -}} |