commit bc10e22452b0d073ac65d014137684bd112a4e55
author Marat Salakhutdinov <marat.salakhutdinov@bell.ca> Tue Oct 13 19:22:15 2020 -0400
committer Sylvain Desbureaux <sylvain.desbureaux@orange.com> Wed Oct 14 12:25:47 2020 +0000
tree dd0be0e4b5eb327013861a97927df2b638c2102c
parent c08c8ffa8ec4f063c22e19acdc0a1e23edd4f26f

[COMMON] More generic Cassandra backup

This patch will fix handling of the backup of cassandra installed with
different than "cassandra" common name.

Issue-ID: OOM-2596
Signed-off-by: Marat Salakhutdinov <marat.salakhutdinov@bell.ca>
Change-Id: Ifff440af79d6626fdbd1c2948795f98aabd167d7

kubernetes/common/cassandra/templates/backup/cronjob.yaml

diff --git a/kubernetes/common/cassandra/templates/backup/cronjob.yaml b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
index 1d1e459..cabe59f 100644
--- a/kubernetes/common/cassandra/templates/backup/cronjob.yaml
+++ b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
@@ -59,7 +59,7 @@
                   curr_time=$1
                   echo "Clearing snapshots!!!"
                   command="nodetool clearsnapshot -t $curr_time"
-                  /app/exec.py -p "cassandra" -c "$command"
+                  /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 }
                 {{ $root := . }}
                 curr_time=`date +%s`
@@ -75,11 +75,11 @@
 
                 echo "Executing cleanup!!"
                 command="nodetool cleanup"
-                /app/exec.py -p "cassandra" -c "$command"
+                /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 echo "Cleaned Node!! Backing up database now!!!"
 
                 command="nodetool snapshot -t $curr_time"
-                /app/exec.py -p "cassandra" -c "$command"
+                /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 retCode=$?
                 if [ $retCode -ne 0 ]; then
                   echo "Backup Failed!!!"