From 8ab4547c34554c76cf455bf877f2b8c451c88228 Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Tue, 12 May 2020 12:53:50 +0200 Subject: [SDNC] Use common aaf template in sdnc Instead of copy-pasting code around aaf_agent usage let's use a common template that automates this. Issue-ID: AAF-1134 Signed-off-by: Krzysztof Opasiak Change-Id: I66886290a1a13ca1c1d924b4d1128adc293b301c --- kubernetes/sdnc/values.yaml | 42 +++++------------------------------------- 1 file changed, 5 insertions(+), 37 deletions(-) (limited to 'kubernetes/sdnc/values.yaml') diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 96ea6e33fd..c8e974562e 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -24,7 +24,6 @@ global: readinessImage: readiness-check:2.0.2 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 - aafAgentImage: onap/aaf/aaf_agent:2.1.15 persistence: mountPath: /dockerdata-nfs aafEnabled: true @@ -70,12 +69,6 @@ secrets: password: '{{ .Values.config.odlPassword }}' # For now this is left hardcoded but should be revisited in a future passwordPolicy: required - - uid: &aaf_secret_uid aaf-creds - type: basicAuth - externalSecret: '{{ ternary (tpl (default "" .Values.aaf_init.aafDeployCredsExternalSecret) .) "aafIsDiabled" .Values.global.aafEnabled }}' - login: '{{ .Values.aaf_init.deploy_fqi }}' - password: '{{ .Values.aaf_init.deploy_pass }}' - passwordPolicy: required - uid: netbox-apikey type: password externalSecret: '{{ .Values.config.netboxApikeyExternalSecret }}' @@ -195,8 +188,8 @@ config: numberGGLogFiles: 10 # dependency / sub-chart configuration -aafConfig: - addconfig: true +certInitializer: + nameOverride: sdnc-cert-initializer fqdn: "sdnc" app_ns: "org.osaaf.aaf" fqi: "sdnc@sdnc.onap.org" @@ -206,19 +199,10 @@ aafConfig: aafDeployPass: demo123456! cadi_latitude: "38.0" cadi_longitude: "-72.0" - secret_uid: *aaf_secret_uid credsPath: /opt/app/osaaf/local - -aaf_init: - agentImage: onap/aaf/aaf_agent:2.1.15 - app_ns: "org.osaaf.aaf" - fqi: "sdnc@sdnc.onap.org" - fqdn: "sdnc" - public_fqdn: "sdnc.onap.org" - deploy_fqi: "deployer@people.osaaf.org" - deploy_pass: "demo123456!" - cadi_latitude: "38.0" - cadi_longitude: "-72.0" + aaf_add_config: > + cd /opt/app/osaaf/local; + /opt/app/aaf_config/bin/agent.sh local showpass {{.Values.fqi}} {{ .Values.fqdn }} | grep cadi_keystore_password= | cut -d= -f 2 > {{ .Values.credsPath }}/.pass 2>&1 mariadb-galera: &mariadbGalera nameOverride: sdnc-db @@ -414,22 +398,6 @@ persistence: mountSubPath: sdnc/mdsal mdsalPath: /opt/opendaylight/current/daexim -certpersistence: - enabled: true - - ## A manually managed Persistent Volume and Claim - ## Requires persistence.enabled: true - ## If defined, PVC must be created manually before volume will be bound - # existingClaim: - - volumeReclaimPolicy: Retain - accessMode: ReadWriteOnce - size: 50Mi - mountPath: /dockerdata-nfs - mountSubPath: sdnc/certs - certPath: /opt/app/osaaf - ##storageClass: "manual" - ingress: enabled: false service: -- cgit 1.2.3-korg