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

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index bedf243639..b014360833 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -1,5 +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.
@@ -16,36 +17,22 @@
 #################################################################
 # Global configuration defaults.
 #################################################################
+
 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
   pullPolicy: "Always"
-  repository: "nexus3.onap.org:10001"
-
-  # Use Local
-  #pullPolicy: IfNotPresent
-  #repository: "nexus3.onap.org:10003"
 
+  cmpv2Enabled: true
+  addTestingComponents: false
   aaf:
     readiness: false
-    image: onap/aaf/aaf_core:2.1.20
+    image: onap/aaf/aaf_core:2.1.23
     aaf_env: "DEV"
     public_fqdn: "aaf.osaaf.org"
-    aaf_release: "El Alto"
+    aaf_release: "Frankfurt"
   # DUBLIN ONLY - for M4 compatibility with Casablanca
   #  aaf_locator_name: "public.%NS.%N"
   #  aaf_locator_name_oom: "%NS.%N"
@@ -57,7 +44,7 @@ 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.20
+      image: onap/aaf/aaf_config:2.1.23
 
     service:
       fqdn: "aaf-service"
@@ -71,8 +58,6 @@ global:
       fqdn: "aaf-oauth"
       internal_port: 8140
       public_port: 31112
-#     Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
-
 
 #################################################################
 # Application configuration defaults.
@@ -110,3 +95,10 @@ ingress:
 persistence: {}
 
 resources: {}
+
+aaf-authz:
+  enabled: true
+aaf-sms:
+  enabled: true
+aaf-sshsm:
+  enabled: false