Merge "[AAF-SMS] Allow to disable CPS part"

diff --combined kubernetes/onap/resources/overrides/sm-onap.yaml
index 06ad5b7,3e8e598..b07b6d3
--- 1/kubernetes/onap/resources/overrides/sm-onap.yaml
--- 2/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@@ -44,11 -44,6 +44,11 @@@
  #######################
  global:
    aafEnabled: false
 +  centralizedLoggingEnabled: false
 +  serviceMesh:
 +    enabled: true
 +    tls: true
 +    engine: "istio"
  aai:
    enabled: true
    global:
@@@ -58,6 -53,10 +58,10 @@@
      replicaCount: 1
  aaf:
    enabled: false
+   aaf-sms:
+     cps:
+       # you must always set the same values as value set in cps.enabled
+       enabled: false
  appc:
    enabled: false
  cassandra: