Merge branch 'devel'

fgci-org · Apr 17, 2020 · 41a59bc · 41a59bc
2 parents ac5217c + c2b05d1
commit 41a59bc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/examples/group_vars/grid/grid.example b/examples/group_vars/grid/grid.example
@@ -124,7 +124,7 @@ logsize: "1000000 52"
 shared_filesystem: "yes"
 joblog: "/var/log/arc/gm-jobs.log"
 
-maxjobs: "10000 10000 80"
+maxjobs: "10000 10000 80 -1 -1"
 wakeupperiod: "30"
 defaultttl: "604800 1209600"
 authplugin: "FINISHED timeout=30,onfailure=pass"

diff --git a/requirements.yml b/requirements.yml
@@ -109,9 +109,9 @@
   path: roles
   version: v1.4.8
 
-- src: https://github.com/CSCfi/ansible-role-fgci-bash
+- src: https://github.com/fgci-org/ansible-role-fgci-bash
   path: roles
-  version: v1.2.9
+  version: v1.3.0
 
 - src: https://github.com/CSCfi/ansible-role-cuda
   path: roles

diff --git a/roles/ip_forwarder/tasks/main.yml b/roles/ip_forwarder/tasks/main.yml
@@ -4,7 +4,7 @@
 - name: set ip_forward to 1 to allow kickstarting of network nodes
   sysctl:
      name: net.ipv4.ip_forward
-     value: 1
+     value: "1"
      sysctl_set: yes 
      reload: no
   remote_user: root

diff --git a/roles/watermark-release/files/fgci-ansible-release b/roles/watermark-release/files/fgci-ansible-release
@@ -1 +1 @@
-2.1.5
+2.1.6