Skip to content

Commit

Permalink
Merge pull request #2 from Azure/feature/import-from-cyclecloud
Browse files Browse the repository at this point in the history
Feature/import from cyclecloud
  • Loading branch information
anhoward authored Feb 15, 2019
2 parents 36b3ac9 + c44b46d commit b93a7a7
Show file tree
Hide file tree
Showing 39 changed files with 3,400 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
build/

# Blobs
blobs/
# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
Expand Down
2 changes: 1 addition & 1 deletion project.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = pbspro
label = PBS Professional OSS
type = scheduler
version = 1.1.0
version = 1.2.0
autoupgrade = true

[blobs]
Expand Down
9 changes: 9 additions & 0 deletions specs/default/chef/roles/pbspro_execute_role.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
#
name "pbspro_execute_role"
description "PBSPro Execute Role"
run_list("recipe[cshared::client]",
"recipe[cuser]",
"recipe[pbspro::execute]",
"recipe[cganglia::client]")
14 changes: 14 additions & 0 deletions specs/default/chef/roles/pbspro_master_role.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
#
name "pbspro_master_role"
description "Open PBSPro Master Role"
run_list("role[scheduler]",
"recipe[cshared::directories]",
"recipe[pbspro::skel]",
"recipe[cuser]",
"recipe[cshared::server]",
"recipe[pbspro::scheduler]",
"recipe[cganglia::server]")

default_attributes "cyclecloud" => { "discoverable" => true }
29 changes: 29 additions & 0 deletions specs/default/chef/site-cookbooks/pbspro/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Description
====

Requirements
====

Usage
====


Platform
----

Tested on:

Cookbooks
----


Resources and Providers
====

TODO

Attributes
====

TODO
====
35 changes: 35 additions & 0 deletions specs/default/chef/site-cookbooks/pbspro/attributes/default.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
#
default[:pbspro][:version] = "18.1.3-0"
default[:pbspro][:slots] = nil

default[:pbspro][:is_grouped] = true

default[:pbspro][:submit_hook][:__comment__] = "This file was generated by serializing node[:cyclecloud][:pbspro][:submit_hook]."
default[:pbspro][:submit_hook][:disable_eager_packing] = true
default[:pbspro][:submit_hook][:enabled] = true

default[:pbspro][:submit_hook][:logging][:level] = "INFO"
default[:pbspro][:submit_hook][:logging][:filename] = "#{node[:cyclecloud][:bootstrap]}/pbs/submit_hook.log"
default[:pbspro][:submit_hook][:logging][:filemode] = "a"
default[:pbspro][:submit_hook][:logging][:format] = "%(asctime)s %(levelname)s %(message)s"


default[:pbspro][:autoscale_hook][:__comment__] = "This file was generated by serializing node[:cyclecloud][:pbspro][:autostart_hook]."
default[:pbspro][:autoscale_hook][:src_dirs] = ["#{node[:cyclecloud][:home]}/system/embedded/lib/python2.7/site-packages",
"#{node[:cyclecloud][:bootstrap]}/pbs"
]
# pass through to the hook config json file
default[:pbspro][:autoscale_hook][:cyclecloud_home] = node[:cyclecloud][:home]
default[:pbspro][:autoscale_hook][:autostart_log_level] = "DEBUG"
default[:pbspro][:autoscale_hook][:autostart_log_file_level] = "DEBUG"

if node[:cyclecloud][:node][:template] == "master"
default[:cyclecloud][:cluster][:autoscale][:idle_time_before_jobs] = 3600
default[:cyclecloud][:cluster][:autoscale][:idle_time_after_jobs] = 300
else
# the pbs autoscaler should be removing idle nodes, but if after an hour of idle time assume something is wrong with the autoscaler.
default[:cyclecloud][:cluster][:autoscale][:idle_time_before_jobs] = 4 * 3600
default[:cyclecloud][:cluster][:autoscale][:idle_time_after_jobs] = 4 * 3600
end
Loading

0 comments on commit b93a7a7

Please sign in to comment.