Merge branch 'master' of...

Merge branch 'master' of gitlab.erc.monash.edu.au:hpc-team/ansible_cluster_in_a_box into addEpelToExtraPackages

roles/fail2ban/handlers/main.yml

+---
+- name: restart fail2ban
+  systemd:
+    name: fail2ban
+    enabled: yes
+    state: restarted
+  become: true
+  become_user: root

roles/fail2ban/tasks/main.yml

+---
+- name: Install fail2ban on Red Hat system
+  yum:
+    name: 
+    - fail2ban-server
+    - fail2ban-sendmail
+    state: present
+  become: true
+  become_user: root
+  when: ansible_os_family == "RedHat"
+
+- name: Copy jail.conf.j2 to /etc/fail2ban/jail.conf
+  template:
+    src: jail.conf.j2
+    dest: /etc/fail2ban/jail.conf
+    backup: yes
+    mode: 0644
+    owner: root
+    group: root
+  become: true
+  become_user: root
+  notify:
+    - restart fail2ban
+
+- name: Enable fail2ban service
+  systemd:
+    name: fail2ban
+    enabled: yes
+    state: started
+  become: true
+  become_user: root

roles/nfs-client/tasks/main.yml

@@ -5,6 +5,7 @@
   with_items:
     - libnfsidmap 
     - nfs-utils
+    - nfstest.noarch
   when: ansible_os_family == "RedHat" and ansible_distribution_major_version == "7"
 
 - name: install dependencies

roles/slurm-start/tasks/main.yml

@@ -54,11 +54,11 @@
   when: use_systemd is defined and start_slurmdbd is defined and slurmdbd_service_installed | changed
 
 - name: start munge
-  service: name=munge state=started enabled=yes
+  service: name=munge state=restarted enabled=yes
   sudo: true
 
 - name: start slurmdbd
-  service: name=slurmdbd state=started enabled=no
+  service: name=slurmdbd state=restarted enabled=no
   sudo: true
   when: start_slurmdbd is defined
 
@@ -69,16 +69,16 @@
   ignore_errors: true
 
 - name: start slurmctl
-  service: name=slurmctld state=started enabled=no
+  service: name=slurmctld state=restarted enabled=no
   sudo: true
   when: use_systemd is defined and start_slurmctld is defined
 
 - name: start slurmd
-  service: name=slurmd state=started enabled={{ slurmd_enabled }}
+  service: name=slurmd state=restarted enabled={{ slurmd_enabled }}
   sudo: true
   when: use_systemd is defined and start_slurmd is defined
 
 - name: start slurm
-  service: name=slurm state=started enabled={{ slurmd_enabled }}
+  service: name=slurm state=restarted enabled={{ slurmd_enabled }}
   sudo: true
   when: use_systemd is not defined and ( start_slurmd is defined or start_slurmctld is defined )

roles/slurm_config/tasks/main.yml

@@ -2,7 +2,3 @@
 - name: install slurm.conf
   copy: src=files/slurm.conf dest={{ slurm_dir }}/etc/slurm.conf
   sudo: true
-
-- name: install job_submit.lua
-  copy: src=files/job_submit.lua dest={{ slurm_dir }}/etc/job_submit.lua
-  sudo: true