From f645b7f17b5751f37cbfdbae7c7dc59b474adab7 Mon Sep 17 00:00:00 2001
From: Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com>
Date: Wed, 20 Mar 2019 06:36:19 +0000
Subject: AAI Rolling upgrade using helm hooks

Change-Id: I81b8c7069e374e2ee789f6dd99e6cb55d98e5d28
Issue-ID: OOM-1676
Signed-off-by: Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com>
---
 .../charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml | 7 ++-----
 kubernetes/aai/charts/aai-champ/templates/deployment.yaml          | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'kubernetes/aai/charts/aai-champ')

diff --git a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
index 38fd64c5dc..3977a68834 100644
--- a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
+++ b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
@@ -47,12 +47,9 @@ xsi:schemaLocation="
         <entry key="storage.backend" value="cassandra"/>
         <entry key="storage.cassandra.read-consistency-level" value="LOCAL_QUORUM"/>
         <entry key="storage.cassandra.write-consistency-level" value="LOCAL_QUORUM"/>
-        <entry key="storage.cassandra.replication-factor" value="3"/>
+        <entry key="storage.cassandra.replication-factor" value="{{ .Values.global.cassandra.replicas }}"/>
         <entry key="storage.cassandra.replication-strategy-class" value="org.apache.cassandra.locator.SimpleStrategy"/>
-
-        {{- $seed_size := default 1 .Values.global.cassandra.replicas | int -}}
-        {{- $global := . }}
-        <entry key="storage.hostname" value="{{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }}"/>
+        <entry key="storage.hostname" value="{{ .Values.global.cassandra.serviceName }}"/>
     </util:map>
 
     <!-- Janus Implementation -->
diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index 8e4d7f48cb..a311f68799 100644
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -36,7 +36,11 @@ spec:
           - /root/ready.py
           args:
           - --container-name
+          {{- if .Values.global.cassandra.localCluster }}
           - aai-cassandra
+          {{- else }}
+          - cassandra
+          {{- end }}
           env:
           - name: NAMESPACE
             valueFrom:
-- 
cgit 1.2.3-korg