[AAF] Disable the AAF deployment in London

Disable the AAF in the values.yaml and in the default helm deployment

Issue-ID: OOM-3094

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I1b0030dabacafe53261eefcdb8956508cc73163b

2 files changed, 3 insertions, 3 deletions

diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index b7b6df3edc..76fadf9b1f 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -29,7 +29,7 @@ mariadb-galera:
 postgres:
   enabled: true
 aaf:
-  enabled: true
+  enabled: false
   aaf-sms:
     cps:
       # you must always set the same values as value set in cps.enabled
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index fe14c032d6..9f69363811 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -200,7 +200,7 @@ global:
   # Disabling AAF
   # POC Mode, only for use in development environment
   # Keep it enabled in production
-  aafEnabled: true
+  aafEnabled: false
   aafAgentImage: onap/aaf/aaf_agent:2.1.20
 
   # Disabling MSB
@@ -224,7 +224,7 @@ global:
         name: cmpv2-issuer-onap
 
   # Enabling CMPv2
-  cmpv2Enabled: true
+  cmpv2Enabled: false
   platform:
     certificates:
       clientSecretName: oom-cert-service-client-tls-secret