diff --git a/roles/slurm_sql_bk/templates/backup_mysql_for_slurm.sh.j2 b/roles/slurm_sql_bk/templates/backup_mysql_for_slurm.sh.j2 index 8b5c9cdcfb3a1629291d5c1fc1c20ed7c502a3a9..55dc58fa0e750ffdffd43b4f6ffdd62c127afc75 100644 --- a/roles/slurm_sql_bk/templates/backup_mysql_for_slurm.sh.j2 +++ b/roles/slurm_sql_bk/templates/backup_mysql_for_slurm.sh.j2 @@ -1,17 +1,17 @@ #!/bin/sh # # mysql dump for slurm. -# S.Michnowicz -# 20/Jan/2016 # TIME=$(date '+%y-%m-%d') -DIR={{ SQL_BK_DIR }} -NAME="$DIR/mysql_dump_20${TIME}.sql" +BIN_DIR={{ MGMT_BIN_DIR }} +DATA_DIR={{ SQL_BK_DATA_DIR }} +NAME="$DATA_DIR/mysql_dump_20${TIME}.sql" -sudo mysqldump --defaults-file=$DIR/mysql.conf slurm_acct_db > $NAME +cd $DATA_DIR +sudo mysqldump --defaults-file=$BIN_DIR/mysql.conf --host={{ SQL_IP }} slurm_acct_db > $NAME sudo chmod go-r $NAME sudo gzip -f $NAME #scp file to dummy user @ Destination Node and Directory -scp ${NAME}.gz {{ SQL_USER }}@{{ SQL_BK_DEST_HOST }}:{{ SQL_BK_DEST_DIR }} +scp -i ~/.ssh/slm_db_backup ${NAME}.gz {{ SQL_USER }}@{{ SQL_BK_DEST_HOST }}:{{ SQL_BK_DEST_DIR }} rm -f ${NAME}.gz diff --git a/roles/slurm_sql_bk/templates/mysql.conf.j2 b/roles/slurm_sql_bk/templates/mysql.conf.j2 index ea91192ca855a9b218f9714654ca91f14e58ab84..3324292642272e1fc446aa5b85416f8264e05282 100644 --- a/roles/slurm_sql_bk/templates/mysql.conf.j2 +++ b/roles/slurm_sql_bk/templates/mysql.conf.j2 @@ -1,3 +1,3 @@ [client] -password="{{ sqlrootPasswd }}" -user=root +password="{{ sqlPasswd }}" +user="{{ sqlUsername }}"