X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faaf%2Fvalues.yaml;h=8eaead5e4b6a752c851c420fc7f88a2f6307fdb6;hb=1f9250d7f5fa19fc479d3d75176cd6219032bd3e;hp=1ddb604c02367961d497fd35150ad14fb6c58b22;hpb=53c66dd8d9b6ef66b02a1c95ce34667169d4f976;p=oom.git

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 1ddb604c02..8eaead5e4b 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,36 +18,49 @@
 #################################################################
 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:latest
   persistence:
     enabled: true
-  pullPolicy: Always
+  # Standard OOM
+  pullPolicy: "Always"
   repository: "nexus3.onap.org:10001"
-  # pullPolicy: IfNotPresent
-  # repository: "nexus3.onap.org:10003"
+
+  # Use Local
+  #pullPolicy: IfNotPresent
+  #repository: "nexus3.onap.org:10003"
 
   aaf:
-    imageVersion: 2.1.13
-    #imageVersion: latest
     readiness: false
+    image: onap/aaf/aaf_core:2.1.20
     aaf_env: "DEV"
     public_fqdn: "aaf.osaaf.org"
-    aaf_release: "Dublin"
+    aaf_release: "El Alto"
   # DUBLIN ONLY - for M4 compatibility with Casablanca
-    aaf_locator_name: "public.%NS.%N"
-    aaf_locator_name_oom: "%NS.%N"
+  #  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"
+    aaf_locator_name: "%NS.%N"
+    aaf_locator_name_oom: "%CNS.%NS.%N"
     cadi_latitude: "38.0"
     cadi_longitude: "-72.0"
     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.20
     cass:
       replicas: 1
+      image: onap/aaf/aaf_cass:2.1.20
       fqdn: "aaf-cass"
       cluster_name: "osaaf"
       heap_new_size: "512M"
@@ -88,9 +102,8 @@ global:
       public_port: 31115
     hello:
       replicas: 0
-      fqdn: "aaf-hello"
-      internal_port: 8130
-      public_port: 31116
+#     Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
+
 
 #################################################################
 # Application configuration defaults.
@@ -127,20 +140,18 @@ persistence:
     volumeReclaimPolicy: Delete
     accessMode: ReadWriteMany
     size: 2Gi
-    storageClass: "manual"
-    mountPath: "/mnt/data/aaf/config"
+    mountPath: /dockerdata-nfs
+    mountSubPath: "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:
@@ -148,8 +159,8 @@ persistence:
     volumeReclaimPolicy: Retain
     accessMode: ReadWriteOnce
     size: 10Gi
-    storageClass: "manual"
     mountPath: /dockerdata-nfs
     mountSubPath: "cass"
 
+
 resources: {}