Merge "[SDNC] Use common aaf template in SDNC"

diff --combined kubernetes/sdnc/values.yaml
index 22a83bb,65aae85..96ea6e3
--- 1/kubernetes/sdnc/values.yaml
--- 2/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -24,6 -24,7 +24,7 @@@ 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
@@@ -69,7 -70,7 +70,7 @@@ secrets
      password: '{{ .Values.config.odlPassword }}'
      # For now this is left hardcoded but should be revisited in a future
      passwordPolicy: required
-   - uid: aaf-creds
+   - 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 }}'
@@@ -118,7 -119,7 +119,7 @@@
  # application images
  repository: nexus3.onap.org:10001
  pullPolicy: Always
 -image: onap/sdnc-image:1.8.1
 +image: onap/sdnc-image:1.8.2
  
  
  # flag to enable debugging - application support required
@@@ -194,6 -195,20 +195,20 @@@ config
        numberGGLogFiles: 10
  
  # dependency / sub-chart configuration
+ aafConfig:
+   addconfig: true
+   fqdn: "sdnc"
+   app_ns: "org.osaaf.aaf"
+   fqi: "sdnc@sdnc.onap.org"
+   fqi_namespace: org.onap.sdnc
+   public_fqdn: "sdnc.onap.org"
+   aafDeployFqi: "deployer@people.osaaf.org"
+   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"