From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 15 Oct 2020 07:21:51 +0000 (+0000)
Subject: Merge "[COMMON] More generic Cassandra backup"
X-Git-Tag: 7.0.0~131
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=017ccc04e3d54dfff43e66c5e5d3b44bbf11a31b;hp=9e8c6de3d71df6f7ed4338d935e9e1dcfe7ac06a;p=oom.git

Merge "[COMMON] More generic Cassandra backup"
---

diff --git a/kubernetes/common/cassandra/templates/backup/cronjob.yaml b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
index 1d1e4594da..cabe59f696 100644
--- a/kubernetes/common/cassandra/templates/backup/cronjob.yaml
+++ b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
@@ -59,7 +59,7 @@ spec:
                   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 @@ spec:
 
                 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!!!"