From c55229650e21c72507976bb696a92661a55bdd22 Mon Sep 17 00:00:00 2001
From: jupiter <jupiter@ansible2.(none)>
Date: Wed, 28 Jan 2015 02:52:13 +0000
Subject: [PATCH] fixed exceptions

---
 playbook/cvl2.yml                          | 63 +++++++++++-----------
 roles/nfs-client/tasks/mountFileSystem.yml |  5 --
 roles/slurm/tasks/main.yml                 |  2 +-
 3 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/playbook/cvl2.yml b/playbook/cvl2.yml
index 5f5569d..908e3af 100644
--- a/playbook/cvl2.yml
+++ b/playbook/cvl2.yml
@@ -29,9 +29,9 @@
         - {fstype : 'ext4', dev: '/dev/vdc2', opts: ''}
         - {fstype : 'ext4', dev: '/dev/vdc3', opts: ''}
     mountFileSystems:
-        - {fstype : 'ext4', dev: '/dev/vdc1', opts: 'defaults,nofail', name: '/scratch'}
-        - {fstype : 'ext4', dev: '/dev/vdc2', opts: 'defaults,nofail', name: '/cvl_home'}
-        - {fstype : 'ext4', dev: '/dev/vdc3', opts: 'defaults,nofail', name: '/usr/local'}
+        - {fstype : 'ext4', dev: '/dev/vdc1', opts: 'defaults,nofail', name: '/cvl/scratch'}
+        - {fstype : 'ext4', dev: '/dev/vdc2', opts: 'defaults,nofail', name: '/cvl/home'}
+        - {fstype : 'ext4', dev: '/dev/vdc3', opts: 'defaults,nofail', name: '/cvl/local'}
   roles:
     - { role: easy-rsa-CA }
     - { role: OpenVPN-Server }
@@ -45,6 +45,9 @@
 - hosts: all 
   vars_files:
     - massive_var/main.yml
+  vars:
+    x509_ca_server: "{{ groups['ManagementNodes'][0] }}"
+    openvpn_servers: "{{ groups['ManagementNodes'] }}"
   roles:
     - { role: etcHosts, domain: "{{ ldapDomain }}" }
 
@@ -54,6 +57,7 @@
     - massive_var/passwords.yml
     - massive_var/package.yml
   vars:
+    x509_ca_server: "{{ groups['ManagementNodes'][0] }}"
     openvpn_servers: "{{ groups['ManagementNodes'] }}"
   roles:
     - { role: OpenVPN-Client }
@@ -64,6 +68,7 @@
     - massive_var/passwords.yml
     - massive_var/package.yml
   vars:
+    x509_ca_server: "{{ groups['ManagementNodes'][0] }}"
     openvpn_servers: "{{ groups['ManagementNodes'] }}"
   roles:
     - { role: OpenVPN-Client }
@@ -71,8 +76,24 @@
 - hosts: all 
   vars_files:
     - massive_var/main.yml
+    - massive_var/passwords.yml
+    - massive_var/package.yml
+  vars:
+    x509_ca_server: "{{ groups['ManagementNodes'][0] }}"
+    nfs_server: "{{ groups['ManagementNodes'][0] }}"
+    openvpn_servers: "{{ groups['ManagementNodes'] }}"
+    groupList:
+      - { name : 'ComputeNodes', interface : 'tun0' }
+      - { name : 'ComputeNodesDev', interface : 'tun0' }
+      - { name : 'ComputeNodesLarge', interface : 'tun0' }
+      - { name : 'LoginNodes', interface : 'tun0' }
+    exportList:
+      - { name: '/usr/local', src: '/cvl/local', fstype: 'nfs4', opts: 'defaults,ro,nofail', interface : 'tun0', srvopts: 'ro,sync' }
+      - { name: '/home', src: '/cvl/home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' }
+      - { name: '/scratch', src: '/cvl/scratch', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' }
   roles:
     - { role: etcHosts, domain: "{{ ldapDomain }}" }
+    - { role: syncExports }
 
 - hosts: 'ComputeNodes'
   vars_files:
@@ -89,13 +110,12 @@
     groupList:
       - { name : 'ComputeNodes', interface : 'tun0' }
     exportList: 
-      - { name: '/usr/local', src: '/usr/local', fstype: 'nfs4', opts: 'defaults,ro,nofail', interface : 'tun0', srvopts: 'ro,fsid=0,sync' } 
-      - { name: '/home', src: '/cvl_home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' } 
-      - { name: '/scratch', src: '/scratch', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' }
+      - { name: '/usr/local', src: '/cvl/local', fstype: 'nfs4', opts: 'defaults,ro,nofail', interface : 'tun0', srvopts: 'ro,sync' } 
+      - { name: '/home', src: '/cvl/home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' } 
+      - { name: '/scratch', src: '/cvl/scratch', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' }
   roles:
     - { role: ntp }
     - { role: openLdapClient }
-    - { role: syncExports }
     - { role: nfs-client }
     - { role: slurm, slurm_use_vpn: true}
     - { role: installPackage, preInstallation: "umount /usr/local", postInstallation: "mount /usr/local", yumGroupPackageList: ["CVL Pre-installation", "CVL Base Packages"], cliFileCopy: {'src': '/tmp/gconf_path', 'dest': '/etc/gconf/2/path'} }
@@ -115,12 +135,11 @@
     groupList:
       - { name : 'ComputeNodes', interface : 'tun0' }
     exportList: 
-      - { name: '/home', src: '/cvl_home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' } 
-      - { name: '/scratch', src: '/scratch', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' }
+      - { name: '/home', src: '/cvl/home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' } 
+      - { name: '/scratch', src: '/cvl/scratch', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' }
   roles:
     - { role: ntp }
     - { role: openLdapClient }
-    - { role: syncExports }
     - { role: nfs-client }
     - { role: slurm, slurm_use_vpn: true}
     - { role: installPackage, preInstallation: "umount /usr/local", postInstallation: "mount /usr/local", yumGroupPackageList: ["CVL Pre-installation", "CVL Base Packages"], cliFileCopy: {'src': '/tmp/gconf_path', 'dest': '/etc/gconf/2/path'} }
@@ -140,13 +159,12 @@
     groupList:
       - { name : 'ComputeNodes', interface : 'tun0' }
     exportList: 
-      - { name: '/usr/local', src: '/usr/local', fstype: 'nfs4', opts: 'defaults,ro,nofail', interface : 'tun0', srvopts: 'ro,fsid=0,sync' }
-      - { name: '/home', src: '/cvl_home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' } 
-      - { name: '/scratch', src: '/scratch', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' }
+      - { name: '/usr/local', src: '/cvl/local', fstype: 'nfs4', opts: 'defaults,ro,nofail', interface : 'tun0', srvopts: 'ro,sync' }
+      - { name: '/home', src: '/cvl/home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' } 
+      - { name: '/scratch', src: '/cvl/scratch', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' }
   roles:
     - { role: ntp }
     - { role: openLdapClient }
-    - { role: syncExports }
     - { role: nfs-client }
     - { role: slurm, slurm_use_vpn: true}
     - { role: installPackage, preInstallation: "umount /usr/local", postInstallation: "mount /usr/local", yumGroupPackageList: ["CVL Pre-installation", "CVL Base Packages"], cliFileCopy: {'src': '/tmp/gconf_path', 'dest': '/etc/gconf/2/path'} }
@@ -164,26 +182,11 @@
     slurmqueues:
       - {name: batch, group: ComputeNodes, default: true}
     exportList: 
-      - { name: '/home', src: '/cvl_home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' } 
+      - { name: '/home', src: '/cvl/home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,sync' } 
   roles:
-    - { role: syncExports }
-#    - { role: OpenVPN-Client }
     - { role: ntp }
     - { role: openLdapClient }
     - { role: nfs-client }
     - { role: slurm, slurm_use_vpn: true}
     - { role: installPackage, importRepo: { command: "wget http://cvlrepo.massive.org.au/repo/cvl.repo -O", destination: "/etc/yum.repos.d/cvl.repo" }, yumGroupPackageList: ['CVL Pre-installation', 'CVL Base Packages'], cliCopy: {'run': 'cp -r /usr/local/Modules/modulefiles/cvl /usr/local/Modules/modulefiles/massive', 'check': '/usr/local/Modules/modulefiles/massive'} }
 
-- hosts: "'ComputeNodes*' 'LoginNodes'"
-  vars_files:
-    - massive_var/main.yml
-    - massive_var/passwords.yml
-    - massive_var/package.yml
-  vars:
-    exportList: 
-      - { name: '/usr/local', src: '/usr/local', fstype: 'nfs4', opts: 'defaults,ro,nofail', interface : 'tun0', srvopts: 'ro,fsid=0,sync' } 
-      - { name: '/home', src: '/cvl_home', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' } 
-      - { name: '/scratch', src: '/scratch', fstype: 'nfs4', opts: 'defaults,nofail', interface : 'tun0', srvopts: 'rw,root_squash,fsid=0,sync' }
-  roles:
-    - { role: syncExports }
-
diff --git a/roles/nfs-client/tasks/mountFileSystem.yml b/roles/nfs-client/tasks/mountFileSystem.yml
index 8d62f72..efa0b51 100644
--- a/roles/nfs-client/tasks/mountFileSystem.yml
+++ b/roles/nfs-client/tasks/mountFileSystem.yml
@@ -1,9 +1,4 @@
 --- 
-#- name: "Check mount"
-#  shell: mount | grep {{ item.name }}
-#  with_items: exportList
-#  register: result 
-  
 - name: "Mounting NFS mounts"
   mount: name={{ item.name }} src={{ hostvars[nfs_server]['ansible_'+item.interface]['ipv4']['address'] }}:{{ item.src }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
   with_items: exportList 
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index d351e46..2706ec9 100644
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -20,7 +20,7 @@
   sudo: true
 
 - name: create slurm user
-  user: name=slurm group=slurm
+  user: name=slurm group=slurm createhome=no 
   sudo: true
 
 - name: install slurm rpms
-- 
GitLab