Merge "[DCAE] Enable optional DCAE components"

3 files changed, 50 insertions, 9 deletions

diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index ad8ca9fb2e..6ce0a1f98a 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -70,10 +70,12 @@ certDirectory: /opt/app/kpims/etc/cert/
 tlsServer: true
 enable_tls: true
 
-dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
-policies:
-  policyID: |
-    '["com.Config_KPIMS_CONFIG_POLICY"]'
+# Optional Policy configuration properties
+# if present, policy-sync side car will be deployed
+#dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
+#policies:
+#  policyID: |
+#    '["com.Config_KPIMS_CONFIG_POLICY"]'
 
 # Dependencies
 readinessCheck:
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index 66731578e3..e8a9403a1c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -81,12 +81,12 @@ certDirectory: /opt/app/sonhms/etc/certs
 # and key from AAF and mount them in certDirectory.
 tlsServer: false
 
-# Policy configuraiton properties
+# Optional Policy configuration properties
 # if present, policy-sync side car will be deployed
-dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
-policies:
-  policyID: |
-    '["com.Config_PCIMS_CONFIG_POLICY"]'
+#dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
+#policies:
+#  policyID: |
+#    '["com.Config_PCIMS_CONFIG_POLICY"]'
 
 # Dependencies
 readinessCheck:
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index f16813fc97..f8f1b4cd81 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -2,6 +2,7 @@
 # Copyright (c) 2020 Nordix Foundation, Modifications
 # Modifications Copyright © 2020 Nokia
 # Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2022 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -56,6 +57,44 @@ dcaegen2:
   enabled: true
 dcaegen2-services:
   enabled: true
+  dcae-datafile-collector:
+    enabled: true
+  dcae-datalake-admin-ui:
+    enabled: true
+  dcae-datalake-des:
+    enabled: true
+  dcae-datalake-feeder:
+    enabled: true
+  dcae-heartbeat:
+    enabled: true
+  dcae-hv-ves-collector:
+    enabled: true
+  dcae-kpi-ms:
+    enabled: true
+  dcae-ms-healthcheck:
+    enabled: true
+  dcae-pm-mapper:
+    enabled: true
+  dcae-pmsh:
+    enabled: true
+  dcae-prh:
+    enabled: true
+  dcae-restconf-collector:
+    enabled: true
+  dcae-slice-analysis-ms:
+    enabled: true
+  dcae-snmptrap-collector:
+    enabled: true
+  dcae-son-handler:
+    enabled: true
+  dcae-tcagen2:
+    enabled: true
+  dcae-ves-collector:
+    enabled: true
+  dcae-ves-mapper:
+    enabled: true
+  dcae-ves-openapi-manager:
+    enabled: true
 dcaemod:
   enabled: true
 holmes: