X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fvalues.yaml;h=f16f3b1925b5e7bed5bfa937a051cfee4583d317;hb=4c2f578754c79f0336e4ba83a236436af36fd58e;hp=22a83bb976ce04c9e1844689883c36aaa036ce67;hpb=1364704d13eb442dc398fb7e3f1325e5098ff541;p=oom.git

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 22a83bb976..f16f3b1925 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -69,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-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 }}'
@@ -118,7 +112,7 @@ secrets:
 # application images
 repository: nexus3.onap.org:10001
 pullPolicy: Always
-image: onap/sdnc-image:1.8.2
+image: onap/sdnc-image:1.8.4
 
 
 # flag to enable debugging - application support required
@@ -194,16 +188,21 @@ config:
       numberGGLogFiles: 10
 
 # dependency / sub-chart configuration
-aaf_init:
-  agentImage: onap/aaf/aaf_agent:2.1.15
+certInitializer:
+  nameOverride: sdnc-cert-initializer
+  fqdn: "sdnc"
   app_ns: "org.osaaf.aaf"
   fqi: "sdnc@sdnc.onap.org"
-  fqdn: "sdnc"
+  fqi_namespace: org.onap.sdnc
   public_fqdn: "sdnc.onap.org"
-  deploy_fqi: "deployer@people.osaaf.org"
-  deploy_pass: "demo123456!"
+  aafDeployFqi: "deployer@people.osaaf.org"
+  aafDeployPass: demo123456!
   cadi_latitude: "38.0"
   cadi_longitude: "-72.0"
+  credsPath: /opt/app/osaaf/local
+  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
@@ -303,7 +302,7 @@ localElasticCluster: true
 elasticsearch:
   nameOverride: sdnrdb
   name: sdnrdb-cluster
-  aafConfig:
+  certInitializer:
     fqdn: "sdnc"
     fqi_namespace: org.onap.sdnc
     fqi: "sdnc@sdnc.onap.org"
@@ -399,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: