X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faaf%2Fvalues.yaml;h=bedf24363910b671d9470e6cce7576437bb73413;hb=942e8f8450f06dc2f20d6c3b5dc28a62ef524770;hp=0109a5e90d9759266702b593178a0690f3cde382;hpb=bbc4c7bbbff54a22916e4a5e040c38a750cb19bb;p=oom.git

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 0109a5e90d..bedf243639 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications © 2020 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,10 +18,18 @@
 #################################################################
 global:
   nodePortPrefix: 302
+  # Readiness image
   readinessRepository: oomk8s
   readinessImage: readiness-check:2.0.2
+  # Ubuntu Init image
   ubuntuInitRepository: registry.hub.docker.com
   ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+  # Logging image
+  loggingRepository: docker.elastic.co
+  loggingImage: beats/filebeat:5.5.0
+  # BusyBox image
+  busyboxRepository: registry.hub.docker.com
+  busyboxImage: library/busybox:1.31
   persistence:
     enabled: true
   # Standard OOM
@@ -33,7 +42,7 @@ global:
 
   aaf:
     readiness: false
-    image: onap/aaf/aaf_core:2.1.15
+    image: onap/aaf/aaf_core:2.1.20
     aaf_env: "DEV"
     public_fqdn: "aaf.osaaf.org"
     aaf_release: "El Alto"
@@ -48,51 +57,22 @@ global:
     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.15
-    cass:
-      replicas: 1
-      image: onap/aaf/aaf_cass:2.1.15
-      fqdn: "aaf-cass"
-      cluster_name: "osaaf"
-      heap_new_size: "512M"
-      max_heap_size: "1024M"
-      storage_port: 7000
-      ssl_storage_port: 7001
-      native_trans_port: 9042
-      rpc_port: 9160
-      dc: "dc1"
+      image: onap/aaf/aaf_config:2.1.20
+
     service:
-      replicas: 1
       fqdn: "aaf-service"
       internal_port: 8100
       public_port: 31110
     locate:
-      replicas: 1
       fqdn: "aaf-locate"
       internal_port: 8095
       public_port: 31111
     oauth:
-      replicas: 1
-      fqdn: "aaf0oauth"
+      fqdn: "aaf-oauth"
       internal_port: 8140
       public_port: 31112
-    gui:
-      replicas: 1
-      fqdn: "aaf-gui"
-      internal_port: 8200
-      public_port: 31113
-    cm:
-      replicas: 1
-      fqdn: "aaf-cm"
-      internal_port: 8150
-      public_port: 31114
-    fs:
-      replicas: 1
-      fqdn: "aaf-fs"
-      internal_port: 8096
-      public_port: 31115
-    hello:
-      replicas: 0
+#     Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
+
 
 #################################################################
 # Application configuration defaults.
@@ -120,38 +100,13 @@ readiness:
 
 ingress:
   enabled: false
-
-## Persist data to a persitent volume
-persistence:
-  enabled: true
+  service:
+    - baseaddr: "aaf.api"
+      name: "aaf-service"
+      port: 8100
   config:
-    #existingClaim:
-    volumeReclaimPolicy: Delete
-    accessMode: ReadWriteMany
-    size: 2Gi
-    storageClass: "manual"
-    mountPath: "/mnt/data/aaf/config"
-  logs:
-    #existingClaim:
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteMany
-    size: 2Gi
-    storageClass: "manual"
-    mountPath: "/mnt/data/aaf/logs"
-  status:
-    volumeReclaimPolicy: Delete
-    accessMode: ReadWriteMany
-    size: 2M
-    storageClass: "manual"
-    mountPath: /dockerdata-nfs
-    mountSubPath: "status"
-  cass:
-    #existingClaim:
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteOnce
-    size: 10Gi
-    storageClass: "manual"
-    mountPath: /dockerdata-nfs
-    mountSubPath: "cass"
+    ssl: "none"
+
+persistence: {}
 
 resources: {}