Merge remote-tracking branch 'origin/master' into upcomingMaintenance

roles/slurm-common/tasks/installSlurmFromSource.yml

@@ -29,7 +29,7 @@
 
 - name: Create ucx directory if it does not exist
   file:
-    path: /usr/local/ucx/
+    path: '/usr/local/ucx/'
     state: directory
     owner: damienl
     group: systems
@@ -49,8 +49,8 @@
 
 - name: symlink ucx to latest
   file:
-    src: /usr/local/ucx/1.8.0
-    dest: /usr/local/ucx/latest
+    src: '/usr/local/ucx/1.8.0'
+    dest: '/usr/local/ucx/latest'
     state: link
     owner: damienl
     group: systems

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:

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 $?"

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  }
 
 ~~~~