From 61bc5ea7452e22703f189b2a8153f97702e09454 Mon Sep 17 00:00:00 2001
From: Cloud User
 <hpcadmin@cvmfs.syfm3xzfs4zejmhhtlcbipmcab.jx.internal.cloudapp.net>
Date: Wed, 1 Feb 2023 09:28:50 +0000
Subject: [PATCH] add support for licensed PBSPro

---
 .../site-cookbooks/pbspro/recipes/execute.rb  | 15 ++++++++-----
 .../site-cookbooks/pbspro/recipes/login.rb    |  9 ++++++--
 .../site-cookbooks/pbspro/recipes/server.rb   | 21 +++++++++++++++++--
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/specs/default/chef/site-cookbooks/pbspro/recipes/execute.rb b/specs/default/chef/site-cookbooks/pbspro/recipes/execute.rb
index 755dd16..5084c83 100644
--- a/specs/default/chef/site-cookbooks/pbspro/recipes/execute.rb
+++ b/specs/default/chef/site-cookbooks/pbspro/recipes/execute.rb
@@ -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
 
diff --git a/specs/default/chef/site-cookbooks/pbspro/recipes/login.rb b/specs/default/chef/site-cookbooks/pbspro/recipes/login.rb
index 4e19536..48d4a72 100644
--- a/specs/default/chef/site-cookbooks/pbspro/recipes/login.rb
+++ b/specs/default/chef/site-cookbooks/pbspro/recipes/login.rb
@@ -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
diff --git a/specs/default/chef/site-cookbooks/pbspro/recipes/server.rb b/specs/default/chef/site-cookbooks/pbspro/recipes/server.rb
index d28b03e..6a2cf09 100644
--- a/specs/default/chef/site-cookbooks/pbspro/recipes/server.rb
+++ b/specs/default/chef/site-cookbooks/pbspro/recipes/server.rb
@@ -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