Change slurm template

roles/easy-rsa-certificate/tasks/buildCert.yml

@@ -33,7 +33,7 @@
   remote_user: "{{ hostvars[x509_ca_server]['ansible_ssh_user'] }}"
   delegate_to: "{{ x509_ca_server }}"
   shell: rm -rf /etc/easy-rsa/2.0/keys/{{ x509_common_name }}.*
-  when: cert.stat.size == 0
+  when: cert is defined and cert.stat.size == 0
 
 - name: "set needcert if cert doesn't match key"
   set_fact: needcert=True

roles/etcHosts/defaults/main.yml

 ---
-domain: testdomain.massive.org.au
+domain: testdomain.dummy.invalid
 get_groups: true
 edit_hosts: true

roles/nfs-client/tasks/mountFileSystem.yml

 --- 
--
-  name: "Get the NFS Network"
+- name: "Get the NFS Network"
   setup: 
   register: nfsServer
   run_once: true
   delegate_to: "{{ nfs_server }}"
-- 
+  when: nfsServer is defined
+
+- name: "Set nfsServer facts when it is not defined"
+  set_fact:
+    - {{ nfsServer }}
+      - ansible_{{ nfsServerInterface }}:
+        - ipv4:
+          - address: {{ nfsServerIpAddress }}
+  when: nfsServer is defined
+
+- name: "Mounting NFS mounts"
   mount: "name={{ item.name }} src={{ nfsServer['ansible_facts']['ansible_'+item.interface]['ipv4']['address'] }}:{{ item.src }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted"
-  name: "Mounting NFS mounts"
   with_items: exportList 
   notify: "restart authentication"
   notify: "restart idmap"

roles/nfs-client/vars/main.yml

 ---
 # This is a list of exports, individual entry for each mount.
 exportList:
- - { name : '/mnt/test-nfs', src : '/mnt',fstype : 'nfs', opts : 'vers=3,noatime,rsize=16384,wsize=16384,hard,intr,tcp,nolock' , interface : 'tun0' }
- - { name : '/mnt/test-volume', src : '/mnt/vdc',fstype : 'nfs', opts : 'vers=3,noatime,rsize=16384,wsize=16384,hard,intr,tcp,nolock' , interface : 'tun0' }
+ - { name : '/mnt/test-nfs', src : '/mnt',fstype : 'nfs', opts : 'vers=3,noatime,rsize=16384,wsize=16384,hard,intr,tcp,nolock' , interface : 'tun0', srvopts: 'rw,sync,root_squash' }
+ - { name : '/mnt/test-volume', src : '/mnt/vdc',fstype : 'nfs', opts : 'vers=3,noatime,rsize=16384,wsize=16384,hard,intr,tcp,nolock' , interface : 'tun0', srvopts: 'rw,sync,root_squash' }

roles/nfs-server/tasks/mkFilesystem.yml

@@ -3,7 +3,10 @@
  name: Format File Systems
  filesystem: fstype={{ item.fstype }} dev={{ item.dev }} opts={{ item.opts }}
  with_items: mkFileSystems
+ when: configDiskDevice
 -
  name: Mount file systems
  mount: name=/mnt/{{ item.dev | basename }} src={{ item.dev }} fstype={{ item.fstype }} opts=loop state=mounted
  with_items: mkFileSystems
+ when: configDiskDevice
+

roles/nfs-server/vars/main.yml

 ---
 mkFileSystems:
  - { fstype : 'ext4', dev : '/dev/vdc', opts: '' } 
+configDiskDevice: true 

roles/slurm/templates/slurm-vpn.conf.j2

@@ -105,5 +105,5 @@ NodeName={{ node }} NodeAddr={{ node }}-vpn Procs={{ hostvars[node]['ansible_pro
 {% endfor %}
 
 {% for queue in slurmqueues %}
-PartitionName={{ queue.name }} Default=yes Nodes={{ groups[queue.group]|join(',') }}
+PartitionName={{ queue.name }} {% if queue.default %}Default=yes{% endif %} Nodes={{ groups[queue.group]|join(',') }}
 {% endfor %}

roles/slurm/templates/slurm.conf.j2

@@ -105,5 +105,5 @@ NodeName={{ node }} Procs={{ hostvars[node]['ansible_processor_cores'] }} State=
 {% endfor %}
 
 {% for queue in slurmqueues %}
-PartitionName={{ queue.name }} Nodes={{ groups[queue.group]|join(',') }}
+PartitionName={{ queue.name }} {% if queue.default %}Default=yes{% endif %} Nodes={{ groups[queue.group]|join(',') }}
 {% endfor %}

roles/syncExports/handlers/main.yml

+---
+- name: Reload exports 
+  command: exportfs -ra
+  delegate_to: "{{ nfs_server }}"
+  run_once: true
+  sudo: true

roles/syncExports/tasks/addExports.yml

@@ -5,9 +5,9 @@
   delegate_to: "{{ nfs_server }}"
   run_once: true
   sudo: true
--
-  name : Restart the NFS Server
-  service: name=nfs state=restarted
-  delegate_to: "{{ nfs_server }}"
-  run_once: true
-  sudo: true
+#-
+#  name : Restart the NFS Server
+#  service: name=nfs state=restarted
+#  delegate_to: "{{ nfs_server }}"
+#  run_once: true
+#  sudo: true

roles/syncExports/templates/exports.j2

 {% for export in exportList %}
-{{ export.src }} {% for group in groupList %}{% for node in  groups[group.name] %}{{ hostvars[node]['ansible_'+group.interface]['ipv4']['address'] }}(rw,sync,root_squash) {% endfor %}{% endfor %}
+{{ export.src }} {% for group in groupList %}{% for node in  groups[group.name] %}{{ hostvars[node]['ansible_'+group.interface]['ipv4']['address'] }}({{ export.option }}) {% endfor %}{% endfor %}
 
 {% endfor %}

roles/syncExports/vars/main.yml

 ---
 groupList:
- - { name : 'openvpn-clients', interface : 'tun0' }
+  - { name : 'openvpn-clients', interface : 'tun0' }