From e5cbdaab087ab375d9aa0d1e9ba49af60a352880 Mon Sep 17 00:00:00 2001
From: Simon Michnowicz <simon.michnowicz@monash.edu>
Date: Thu, 14 Mar 2019 14:04:22 +1100
Subject: [PATCH] file that deletes old job is now unique to cluster, so that
M3 and Monarch can have different files
Former-commit-id: c792209088b19239c58c6d2b86423fb3897f54e5
---
roles/slurm_sql_bk/tasks/main.yml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/roles/slurm_sql_bk/tasks/main.yml b/roles/slurm_sql_bk/tasks/main.yml
index b211f7ef..70cd5265 100644
--- a/roles/slurm_sql_bk/tasks/main.yml
+++ b/roles/slurm_sql_bk/tasks/main.yml
@@ -57,11 +57,16 @@
#
# template delete file to localhost.then copy to remote host
#
+ - name: make a unique name for the backup script
+ set_fact:
+ unique_name: "delete_old_mysql_bk_{{ SQL_BK_DEST_DIR | basename }}.sh"
+ - name: Unique filename is
+ debug: var=unique_name
- name: delete local del file
- local_action: command rm -f ./delete_old_mysql_bk.sh
+ local_action: command rm -f ./{{ unique_name }}
- name: template delete script to local dir
- local_action: template src=delete_old_mysql_bk.sh.j2 dest=./delete_old_mysql_bk.sh
+ local_action: template src=delete_old_mysql_bk.sh.j2 dest=./{{ unique_name }}
- name: copy backup script to server ec2-user@{{ SQL_BK_DEST_HOST }}
- local_action: command scp -i ./slm_db_backup ./delete_old_mysql_bk.sh "ec2-user@{{ SQL_BK_DEST_HOST }}:"
+ local_action: command scp -i ./slm_db_backup ./{{ unique_name }} "ec2-user@{{ SQL_BK_DEST_HOST }}:"
- name: insert delete cron job entry on remote server
- local_action: command ssh -i ./slm_db_backup ec2-user@{{ SQL_BK_DEST_HOST }} "{ crontab -l ; echo '#delete old slurm backups' ; echo '00 23 * * * /home/ec2-user/delete_old_mysql_bk.sh' ; } | crontab - "
+ local_action: command ssh -i ./slm_db_backup ec2-user@{{ SQL_BK_DEST_HOST }} "{ crontab -l ; echo '#delete old slurm backups' ; echo '00 23 * * * /home/ec2-user/{{ unique_name }}' ; } | crontab - "
--
GitLab