Merge "[COMMON] templates for centralized logs"

diff --combined kubernetes/onap/values.yaml
index 6233394,0e6a27c..5839add
--- 1/kubernetes/onap/values.yaml
--- 2/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -56,10 -56,6 +56,10 @@@ global
    # image pull policy
    pullPolicy: Always
  
 +  # default clusterName
 +  # {{ template "common.fullname" . }}.{{ template "common.namespace" . }}.svc.{{ .Values.global.clusterName }}
 +  clusterName: cluster.local
 +
    # default mount path root directory referenced
    # by persistent volumes and log files
    persistence:
@@@ -103,6 -99,11 +103,11 @@@
    # if set this element will force or not tls even if serviceMesh.tls is set.
    # tlsEnabled: false
  
+   # Logging
+   # Currently, centralized logging is not in best shape so it's disabled by
+   # default
+   centralizedLoggingEnabled: &centralizedLogging false
+ 
  
  # Example of specific for the components where you want to disable TLS only for
  # it:
@@@ -180,8 -181,11 +185,11 @@@ dmaap
    enabled: false
  esr:
    enabled: false
+ # Today, "logging" chart that perform the central part of logging must also be
+ # enabled in order to make it work. So `logging.enabled` must have the same
+ # value than centralizedLoggingEnabled
  log:
-   enabled: false
+   enabled: *centralizedLogging
  sniro-emulator:
    enabled: false
  oof: