Merge "[COMMON] Update Makefiles to enable parallelization"

1 files changed, 20 insertions, 15 deletions

diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index a56126a093..751f84814c 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -15,13 +15,25 @@
 ###################################################################
 # This override file enables helm charts for all ONAP applications.
 ###################################################################
+#ingress virtualhost based configuration
+global:
+  ingress:
+    enabled: true
+  addTestingComponents: &testing true
+  centralizedLoggingEnabled: &centralizedLogging false
 cassandra:
   enabled: true
 mariadb-galera:
   enabled: true
+postgres:
+  enabled: true
 
 aaf:
   enabled: true
+  aaf-sms:
+    cps:
+      # you must always set the same values as value set in cps.enabled
+      enabled: true
 aai:
   enabled: true
 appc:
@@ -32,9 +44,12 @@ clamp:
   enabled: true
 cli:
   enabled: true
-consul:
-  enabled: true
+# Today, "contrib" chart that hosting these components must also be enabled
+# in order to make it work. So `contrib.enabled` must have the same value than
+# addTestingComponents
 contrib:
+  enabled: *testing
+consul:
   enabled: true
 cps:
   enabled: true
@@ -42,6 +57,8 @@ dcaegen2:
   enabled: true
 dcaegen2-services:
   enabled: true
+dcaemod:
+  enabled: true
 holmes:
   enabled: true
 dmaap:
@@ -57,7 +74,7 @@ nbi:
 policy:
   enabled: true
 portal:
-  enabled: true
+  enabled: false
 robot:
   enabled: true
 sdc:
@@ -66,14 +83,6 @@ sdnc:
   enabled: true
 so:
   enabled: true
-  ingress:
-    enabled: true
-  so-monitoring:
-    ingress:
-      enabled: true
-  so-vnfm-adapter:
-    ingress:
-      enabled: true
 strimzi:
   enabled: true
 uui:
@@ -87,7 +96,3 @@ vid:
 vnfsdk:
   enabled: true
 
-#ingress virtualhost based configuration
-global:
-  ingress:
-    enabled: true