Skip to content

add support for licensed PBSPro #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hmeiland wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for licensed PBSPro #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions specs/default/chef/site-cookbooks/pbspro/recipes/execute.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,21 @@
include_recipe 'pbspro::default'

pbsprover = node[:pbspro][:version]
pbsprosupported = node[:pbspro][:supported]

plat_ver = node['platform_version'].to_i
pbsdist = "el#{plat_ver}"
package_name = node[:pbspro][:package]

if package_name == nil
if pbsprover.to_i < 20
package_name = "pbspro-execution-#{pbsprover}.x86_64.rpm"
else
package_name = "openpbs-execution-#{pbsprover}.x86_64.rpm"
if pbsprosupported == true
package_name = "pbspro-execution-#{pbsprover}.x86_64.rpm"
else
if package_name == nil
if pbsprover.to_i < 20
package_name = "pbspro-execution-#{pbsprover}.x86_64.rpm"
else
package_name = "openpbs-execution-#{pbsprover}.x86_64.rpm"
end
end
end

Expand Down
9 changes: 7 additions & 2 deletions specs/default/chef/site-cookbooks/pbspro/recipes/login.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@
include_recipe 'pbspro::default'

pbsprover = node[:pbspro][:version]
pbsprosupported = node[:pbspro][:supported]
plat_ver = node['platform_version'].to_i
pbsdist = "el#{plat_ver}"

if pbsprover.to_i < 20
if pbsprosupported == true
package_name = "pbspro-client-#{pbsprover}.x86_64.rpm"
else
package_name = "openpbs-client-#{pbsprover}.x86_64.rpm"
if pbsprover.to_i < 20
package_name = "pbspro-client-#{pbsprover}.x86_64.rpm"
else
package_name = "openpbs-client-#{pbsprover}.x86_64.rpm"
end
end

jetpack_download package_name do
Expand Down
21 changes: 19 additions & 2 deletions specs/default/chef/site-cookbooks/pbspro/recipes/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,30 @@
include_recipe 'pbspro::default'

pbsprover = node[:pbspro][:version]
pbsprosupported = node[:pbspro][:supported]
plat_ver = node['platform_version'].to_i
pbsdist = "el#{plat_ver}"

if pbsprover.to_i < 20
if pbsprosupported == true
package_name = "pbspro-server-#{pbsprover}.x86_64.rpm"
else
package_name = "openpbs-server-#{pbsprover}.x86_64.rpm"
if pbsprover.to_i < 20
package_name = "pbspro-server-#{pbsprover}.x86_64.rpm"
else
package_name = "openpbs-server-#{pbsprover}.x86_64.rpm"
end
end

if pbsprosupported == true
user 'pbsdata' do
username 'pbsdata'
end
directory "/home/pbsdata" do
owner "pbsdata"
group "pbsdata"
mode "0700"
action :create
end
end

jetpack_download package_name do
Expand Down