From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Tue, 29 Oct 2019 14:56:11 +0000 (+0000)
Subject: Merge "AAF cert dist for DMaaP DR"
X-Git-Tag: 6.0.0~555
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=e3806913b0551c6bc5d5d66538f6bb59cd33fd2a

Merge "AAF cert dist for DMaaP DR"
---

e3806913b0551c6bc5d5d66538f6bb59cd33fd2a
diff --cc kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index f6d67214a6,671b42ff9b..21524ef30c
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@@ -67,10 -66,9 +67,10 @@@ spec
                port: {{ .Values.service.externalPort }}
              initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
              periodSeconds: {{ .Values.readiness.periodSeconds }}
 +            timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
            env:
            - name: enableCadi
-             value: "true"
+             value: "{{ .Values.global.aafEnabled }}"
            volumeMounts:
            - mountPath: /etc/localtime
              name: localtime