From 58177f564624c51cb9e4dd0d464f48b4c4308fe8 Mon Sep 17 00:00:00 2001
From: "Gerbenvandervries@gmail.com" <gerbenvandervries@gmail.com>
Date: Thu, 21 Mar 2019 16:02:25 +0000
Subject: [PATCH] added extra groups, and datamanager users

---
 group_vars/all/vars.yml                  | 12 +++++++++
 group_vars/hyperchicken-cluster/vars.yml | 34 +++++++++++++-----------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 83c69984d..1a25ad9e6 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -103,6 +103,14 @@ auth_users:
     uid: 1016
     pub_keys: |
               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKOKgVel0GbF67zZaVR0TFo82e5XeZOP1e3Ld3gIdaER h.j.zilverberg
+  solve-rd-dm:
+    comment: 'Datamanager user of solve-rd group'
+    uid: 1018
+    pub_keys:
+  umcg-atd-dm:
+    comment: 'Datamanager user of umcg-atd group'
+    uid: 1019
+    pub_keys:
   envsync:
     comment: 'Environment Synchronizer'
     uid: 1017
@@ -124,4 +132,8 @@ auth_groups:
     gid: 20002
   depad:
     gid: 20003
+  solve-rd:
+    gid: 20004
+  umcg-atd:
+    gid: 20005
 ...
diff --git a/group_vars/hyperchicken-cluster/vars.yml b/group_vars/hyperchicken-cluster/vars.yml
index 2acd1dac8..4820a2c62 100644
--- a/group_vars/hyperchicken-cluster/vars.yml
+++ b/group_vars/hyperchicken-cluster/vars.yml
@@ -8,7 +8,7 @@ motd: "To solve or not to solve, that's the question."
 vcompute_hostnames: "{{ stack_prefix }}-vcompute[01-05]"
 vcompute_sockets: 16
 vcompute_cores_per_socket: 1
-vcompute_real_memory: 64000
+vcompute_real_memory: 64264
 vcompute_max_cpus_per_node: "{{ vcompute_sockets * vcompute_cores_per_socket - 2 }}"
 vcompute_max_mem_per_node: "{{ vcompute_real_memory - vcompute_sockets * vcompute_cores_per_socket * 512 }}"
 vcompute_local_disk: 0
@@ -19,7 +19,7 @@ vcompute_ethernet_interfaces:
 ui_hostnames: "{{ slurm_cluster_name }}"
 ui_sockets: 4
 ui_cores_per_socket: 1
-ui_real_memory: 7800
+ui_real_memory: 7821
 ui_local_disk: 0
 ui_features: 'prm07,tmp07'
 ui_ethernet_interfaces:
@@ -57,41 +57,45 @@ local_admin_users:
   - 'morris'
   - 'pieter'
   - 'wim'
+  - 'umcg-atd-dm'
+  - 'solve-rd-dm'
 envsync_user: 'envsync'
 envsync_group: 'depad'
 local_regular_groups:
   - 'users'
   - 'depad'
+  - 'solve-rd'
+  - 'umcg-atd'
 local_regular_users:
   - user: 'envsync'
     groups: ['depad']
   - user: 'gvdvries'
-    groups: ['users', 'depad']
+    groups: ['users', 'depad','umcg-atd', 'solve-rd']
   - user: 'mbijlsma'
-    groups: ['users', 'depad']
+    groups: ['users', 'depad','umcg-atd', 'solve-rd']
   - user: 'mswertz'
-    groups: ['users', 'depad']
+    groups: ['users', 'depad','umcg-atd', 'solve-rd']
   - user: 'pneerincx'
-    groups: ['users', 'depad']
+    groups: ['users', 'depad','umcg-atd', 'solve-rd']
   - user: 'rkanninga'
-    groups: ['users', 'depad']
+    groups: ['users', 'depad','umcg-atd', 'solve-rd']
 pfs_mounts: [
   { pfs: 'Solve-RD',
     source: 'em-isi-3126.ebi.ac.uk:/ifs/Solve-RD',
-    type: 'nfs4',
-    rw_options: 'defaults,_netdev,vers=4.0,noatime,nodiratime',
-    ro_options: 'defaults,_netdev,vers=4.0,noatime,nodiratime,ro' },
+    type: 'nfs',
+    rw_options: 'defaults,_netdev,noatime,nodiratime',
+    ro_options: 'defaults,_netdev,noatime,nodiratime,ro' },
 ]
 lfs_mounts: [
   { lfs: 'home',
     pfs: 'Solve-RD' },
-  { lfs: 'groups/GROUP/tmp01',
+  { lfs: 'groups/GROUP/tmp09',
     pfs: 'Solve-RD',
-    groups: ['umcg-atd', 'Solve-RD'] },
-  { lfs: 'groups/GROUP/prm01',
+    groups: ['umcg-atd', 'solve-rd'] },
+  { lfs: 'groups/GROUP/prm09',
     pfs: 'Solve-RD',
-    groups: ['umcg-atd', 'Solve-RD'] },
-  { lfs: 'env08',
+    groups: ['umcg-atd', 'solve-rd'] },
+  { lfs: 'env09',
     pfs: 'Solve-RD',
     machines: "{{ groups['compute-vm'] + groups['user-interface'] }}" },
 ]