From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 26 May 2020 07:19:12 +0000 (+0200)
Subject: Revert "Using AAF release Frankfurt dockers"
X-Git-Tag: 7.0.0~414
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b70b4266de5ea47d84b6d71f89e73eef25ed855a;p=oom.git

Revert "Using AAF release Frankfurt dockers"

This reverts commit 306fa85f8e97e1e7f95f8b429088f570f2926d39.
Since this patch, we're seeing a lot of errors on healtchecks and e2e
tests.
Reverting it in order to make master work again.

Issue-ID: AAF-1127
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ie40559ef5a3da60457b0af306b802e7a81d968be
---

diff --git a/kubernetes/aaf/charts/aaf-cass/values.yaml b/kubernetes/aaf/charts/aaf-cass/values.yaml
index e347df2e95..3d9f21e297 100644
--- a/kubernetes/aaf/charts/aaf-cass/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cass/values.yaml
@@ -34,7 +34,7 @@ liveness:
   enabled: true
   port: tcp-cql
 
-image: onap/aaf/aaf_cass:2.1.22
+image: onap/aaf/aaf_cass:2.1.20
 
 config:
   cluster_name: osaaf
diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml
index 786f0b03a5..aeb659082d 100644
--- a/kubernetes/aaf/charts/aaf-hello/values.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/values.yaml
@@ -41,7 +41,7 @@ aaf_init:
 
 replicaCount: 0
 
-image: onap/aaf/aaf_hello:2.1.22
+image: onap/aaf/aaf_hello:2.1.20
 
 service:
   name: aaf-hello
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index cc97e9854b..bedf243639 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -42,10 +42,10 @@ global:
 
   aaf:
     readiness: false
-    image: onap/aaf/aaf_core:2.1.22
+    image: onap/aaf/aaf_core:2.1.20
     aaf_env: "DEV"
     public_fqdn: "aaf.osaaf.org"
-    aaf_release: "Frankfurt"
+    aaf_release: "El Alto"
   # DUBLIN ONLY - for M4 compatibility with Casablanca
   #  aaf_locator_name: "public.%NS.%N"
   #  aaf_locator_name_oom: "%NS.%N"
@@ -57,7 +57,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.22
+      image: onap/aaf/aaf_config:2.1.20
 
     service:
       fqdn: "aaf-service"