X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faaf%2Fvalues.yaml;h=a19f10238523c0d83bd134de0ccdec5ebb22bfd5;hb=66789f218b8464f28a08572ef0c30dbfe40b13c5;hp=24351da9cb1250b63372de8c40e50f010714c9c6;hpb=5bb27a99ddb43f4c46157604be2645ef5a79e2cb;p=oom.git

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 24351da9cb..b014360833 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -1,4 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications © 2020 AT&T
+# Modifications Copyright © 2020 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,28 +17,51 @@
 #################################################################
 # Global configuration defaults.
 #################################################################
+
 global:
   nodePortPrefix: 302
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
-  ubuntuInitRepository: registry.hub.docker.com
-  ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
-  configImage: onap/aaf/aaf_config:2.1.8
   persistence:
     enabled: true
+  # Standard OOM
+  pullPolicy: "Always"
 
-  cadi:
-    hostname: "aaf.onap"
+  cmpv2Enabled: true
+  addTestingComponents: false
+  aaf:
+    readiness: false
+    image: onap/aaf/aaf_core:2.1.23
+    aaf_env: "DEV"
+    public_fqdn: "aaf.osaaf.org"
+    aaf_release: "Frankfurt"
+  # DUBLIN ONLY - for M4 compatibility with Casablanca
+  #  aaf_locator_name: "public.%NS.%N"
+  #  aaf_locator_name_oom: "%NS.%N"
+  # EL ALTO and Beyond
+    aaf_locator_name: "%NS.%N"
+    aaf_locator_name_oom: "%CNS.%NS.%N"
     cadi_latitude: "38.0"
     cadi_longitude: "-72.0"
-    aaf_env: "DEV"
-    cass_host: "aaf-cass.onap"
-    cadi_locator_as: "aaf-locate.onap"
+    cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
+
+    config:
+      image: onap/aaf/aaf_config:2.1.23
+
+    service:
+      fqdn: "aaf-service"
+      internal_port: 8100
+      public_port: 31110
+    locate:
+      fqdn: "aaf-locate"
+      internal_port: 8095
+      public_port: 31111
+    oauth:
+      fqdn: "aaf-oauth"
+      internal_port: 8140
+      public_port: 31112
 
 #################################################################
 # Application configuration defaults.
 #################################################################
-repository: nexus3.onap.org:10001
 
 flavor: small
 # default number of instances
@@ -48,46 +73,32 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 350
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 150
   periodSeconds: 10
 
 ingress:
   enabled: false
-
-## Persist data to a persitent volume
-persistence:
-  mountPath: "/mnt/data/aaf"
-  enabled: true
+  service:
+    - baseaddr: "aaf.api"
+      name: "aaf-service"
+      port: 8100
   config:
-    #existingClaim:
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteMany
-    size: 2Gi
-    mountSubPath: "config"
-    storageClass: "manual"
-  logs:
-    #existingClaim:
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteMany
-    size: 2Gi
-    mountSubPath: "logs"
-    storageClass: "manual"
+    ssl: "none"
 
-aaf-cs:
-  persistence:
-    #existingClaim:
-    mountPath: /dockerdata-nfs
-    mountSubPath: "cass"
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteOnce
-    size: 10Gi
-    storageClass: "manual"
+persistence: {}
 
 resources: {}
+
+aaf-authz:
+  enabled: true
+aaf-sms:
+  enabled: true
+aaf-sshsm:
+  enabled: false