Merge pull request #18 from Azure/feature/1.3.5

Feature/1.3.5

Author: anhoward

project.ini

@@ -2,7 +2,7 @@
 name = pbspro
 label = PBS Professional OSS
 type = scheduler
-version = 1.3.4
+version = 1.3.5
 autoupgrade = true
 
 [blobs]

specs/default/chef/site-cookbooks/pbspro/files/default/doqmgr.sh

@@ -2,6 +2,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 #
+set -e
 
 /opt/pbs/bin/qmgr -c 'set server managers = root@*'
 /opt/pbs/bin/qmgr -c 'set server query_other_jobs = true'
@@ -24,14 +25,12 @@ create_resource ngpus size
 /opt/pbs/bin/qmgr -c "set queue workq resources_default.ungrouped = false"
 /opt/pbs/bin/qmgr -c "set queue workq resources_default.place = scatter"
 /opt/pbs/bin/qmgr -c "set queue workq default_chunk.ungrouped = false"
-/opt/pbs/bin/qmgr -c "set queue workq default_chunk.place = scatter"
 
 /opt/pbs/bin/qmgr -c "create queue htcq"
 /opt/pbs/bin/qmgr -c "set queue htcq queue_type = Execution"
 /opt/pbs/bin/qmgr -c "set queue htcq resources_default.ungrouped = true"
 /opt/pbs/bin/qmgr -c "set queue htcq resources_default.place = pack"
 /opt/pbs/bin/qmgr -c "set queue htcq default_chunk.ungrouped = true"
-/opt/pbs/bin/qmgr -c "set queue htcq default_chunk.place = pack"
 /opt/pbs/bin/qmgr -c "set queue htcq enabled = true"
 /opt/pbs/bin/qmgr -c "set queue htcq started = true"
 

specs/default/chef/site-cookbooks/pbspro/files/default/modify_limits.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+#
+set -e
+
+sed -i "s/^if /#if /g" /opt/pbs/lib/init.d/limits.pbs_mom
+sed -i "s/^fi/#fi /g" /opt/pbs/lib/init.d/limits.pbs_mom

specs/default/chef/site-cookbooks/pbspro/recipes/scheduler.rb

@@ -39,6 +39,14 @@
   action :create
 end
 
+cookbook_file "/var/spool/pbs/modify_limits.sh" do
+  source "modify_limits.sh"
+  mode "0755"
+  owner "root"
+  group "root"
+  action :create
+end
+
 cookbook_file "/var/spool/pbs/sched_priv/sched_config" do
   source "sched.config"
   owner "root"
@@ -51,7 +59,7 @@
 end
 
 execute "serverconfig" do
-  command "/var/spool/pbs/doqmgr.sh && touch /etc/qmgr.config"
+  command "/var/spool/pbs/doqmgr.sh && /var/spool/pbs/modify_limits.sh && touch /etc/qmgr.config"
   creates "/etc/qmgr.config"
   notifies :restart, 'service[pbs]', :delayed
 end