From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 3 Feb 2020 13:39:00 +0000 (+0000)
Subject: Revert "Make cassandra service mesh compliant"
X-Git-Tag: 6.0.0~413^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dc829b7c242851d31333cff7602a2bbc460f9c42;p=oom.git

Revert "Make cassandra service mesh compliant"

This reverts commit 239bb3e18494584587ee1a6eb482f022b9e32d44.

Reason for revert: mandatory template functions not merged yet

Issue-ID: OOM-2252
Change-Id: I80444a7103e12aea4568f03ded08e348bba927fb
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
---

diff --git a/kubernetes/common/cassandra/templates/statefulset.yaml b/kubernetes/common/cassandra/templates/statefulset.yaml
index 2f262ca149..b737a8f960 100644
--- a/kubernetes/common/cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/cassandra/templates/statefulset.yaml
@@ -115,14 +115,6 @@ spec:
             value: {{ default "GossipingPropertyFileSnitch" .Values.config.endpoint_snitch | quote }}
           - name: CASSANDRA_AUTHENTICATOR
             value: {{ default "PasswordAuthenticator" .Values.config.authenticator | quote }}
-          {{- if  (include "common.serviceMesh" .) }}
-          - name: CASSANDRA_LISTEN_ADDRESS
-            value: "127.0.0.1"
-          - name: CASSANDRA_BROADCAST_ADDRESS
-            valueFrom:
-              fieldRef:
-                fieldPath: status.podIP
-          {{- end }}
           - name: POD_IP
             valueFrom:
               fieldRef: