diff --git a/roles/slurm_mv_logs/README.md b/roles/slurm_mv_logs/README.md index e2d93ef1e07dade907e4d8ff68d1097fe8327910..bf36bf537acd712c94ec0ab8e500569ce7e6bfda 100644 --- a/roles/slurm_mv_logs/README.md +++ b/roles/slurm_mv_logs/README.md @@ -18,7 +18,7 @@ where slurm_bk.yml contains - hosts: 'ManagementNodes' gather_facts: True roles: - - { role: slurm_mv_logs, copy_key: "True", BK_DEST_HOST: "118.138.234.186", BK_DEST_DIR: "/mnt/backup/monarch/slurm-logs", SLURM_LOG_DIR: "/mnt/slurm-logs", BK_DEST_USER: "ec2-user", MGR_BIN_DIR: "/root/bin", PRIVATE_KEY: slm_db_backup, PUBLIC_KEY: "files/slm_db_backup" } + - { role: slurm_mv_logs, copy_key: "True", BK_DEST_HOST: "118.138.235.215", BK_DEST_DIR: "/mnt/backup/monarch/slurm-logs", SLURM_LOG_DIR: "/mnt/slurm-logs", BK_DEST_USER: "YOURUSERNAME", MGR_BIN_DIR: "/root/bin", PRIVATE_KEY: slm_db_backup, PUBLIC_KEY: "files/slm_db_backup" } ~~~~ Meaning: diff --git a/roles/slurm_mv_logs/templates/mv_slurm_logs.sh.j2 b/roles/slurm_mv_logs/templates/mv_slurm_logs.sh.j2 index 31c600ab7044200f0c8576ab086f4f8ff4f40f6d..ecd84eb5c9cec14406b1840d3f53d7b807d4b35a 100644 --- a/roles/slurm_mv_logs/templates/mv_slurm_logs.sh.j2 +++ b/roles/slurm_mv_logs/templates/mv_slurm_logs.sh.j2 @@ -19,7 +19,7 @@ do scp -i ~/.ssh/slm_db_backup $file {{ BK_DEST_USER }}@{{ BK_DEST_HOST }}:{{ BK_DEST_DIR }} if [ $? -eq 0 ]; then echo "scp $file worked. Deleting it" - echo "scp -i ~/.ssh/slm_db_backup $file ec2-user@118.138.234.186:$destName" | mail -s "Moved slurm log file $file" simon.michnowicz@monash.edu + echo "scp -i ~/.ssh/slm_db_backup $file {{ BK_DEST_USER }}@{{ BK_DEST_HOST }}:$destName" | mail -s "Moved slurm log file $file" simon.michnowicz@monash.edu #rm -f $file else echo "ERROR: Failure to scp $file $?" diff --git a/roles/slurm_sql_bk/README.md b/roles/slurm_sql_bk/README.md index 112e483628b16934d2bd4cfe5a8dea8bf238edf7..cb3a4d34ae4326910a63e95f06b9f45aa761f8ac 100644 --- a/roles/slurm_sql_bk/README.md +++ b/roles/slurm_sql_bk/README.md @@ -20,11 +20,11 @@ where slurm_bk.yml contains - hosts: 'ManagementNodes' gather_facts: True roles: - - { role: slurm_sql_bk, create_key: "True", SQL_BK_DEST_HOST: "118.138.234.186", SQL_BK_DEST_DIR: "/mnt/backup/monarch", SQL_IP: "172.16.226.88" , sqlUsername: "slurmdb", sqlPasswd: "{{ slurmdb_passwd }}" } + - { role: slurm_sql_bk, create_key: "True", SQL_BK_DEST_HOST: "118.138.235.215", SQL_BK_DEST_DIR: "/mnt/backup/monarch", SQL_IP: "172.16.226.88" , sqlUsername: "slurmdb", sqlPasswd: "{{ slurmdb_passwd }}" } or - - { role: slurm_sql_bk, copy_key: "True", SQL_BK_DEST_HOST: "118.138.234.186", SQL_BK_DEST_DIR: "/mnt/backup/monarch", SQL_IP: "172.16.226.88" , sqlUsername: "slurmdb", sqlPasswd: "{{ slurmdb_passwd }}", PRIVATE_KEY: slm_db_backup.private , PUBLIC_KEY: slm_db_backup.public } + - { role: slurm_sql_bk, copy_key: "True", SQL_BK_DEST_HOST: "118.138.235.215", SQL_BK_DEST_DIR: "/mnt/backup/monarch", SQL_IP: "172.16.226.88" , sqlUsername: "slurmdb", sqlPasswd: "{{ slurmdb_passwd }}", PRIVATE_KEY: slm_db_backup.private , PUBLIC_KEY: slm_db_backup.public } ~~~~