diff --git a/Puppetfile b/Puppetfile index 40c8997c1..e438099ac 100644 --- a/Puppetfile +++ b/Puppetfile @@ -33,7 +33,9 @@ mod 'puppetlabs-mount_core', '1.0.4' mod 'puppetlabs-mysql', '13.3.0' mod 'puppetlabs-stdlib', '5.2.0' mod 'puppetlabs-transition', '0.1.3' -mod 'treydock-globus', '9.0.0' +mod 'c3g-globus', + :git => 'https://github.com/c3g/puppet-module-globus.git', + :branch => 'main' mod 'computecanada-jupyterhub', :git => 'https://github.com/ComputeCanada/puppet-jupyterhub.git', diff --git a/site/profile/manifests/globus.pp b/site/profile/manifests/globus.pp index 6ddd4037e..41e4608a2 100644 --- a/site/profile/manifests/globus.pp +++ b/site/profile/manifests/globus.pp @@ -1,17 +1,32 @@ -class profile::globus { +class profile::globus( + String $display_name, + String $organization, + String $owner, + String $contact_email, + +) { package { 'wget': ensure => installed, } - $public_ip = lookup("terraform.instances.${facts['networking']['hostname']}.public_ip") - class { 'globus': - display_name => $globus::display_name, - client_id => $globus::client_id, - client_secret => $globus::client_secret, - contact_email => $globus::contact_email, - ip_address => $public_ip, - organization => $globus::organization, - owner => $globus::owner, - require => Package['wget'], - } +$public_ip = lookup("terraform.instances.${facts['networking']['hostname']}.public_ip") +$users = lookup("profile::users::ldap::users") + +class { 'globus': + display_name => $display_name, + organization => $organization, + owner => $owner, + contact_email => $contact_email, + ip_address => $public_ip, + users => $users +} + +# class { 'globus': +# display_name => $globus::display_name, +# contact_email => $globus::contact_email, +# ip_address => $public_ip, +# organization => $globus::organization, +# owner => $globus::owner, +# require => Package['wget'], +# } } diff --git a/site/profile/manifests/users.pp b/site/profile/manifests/users.pp index 3b3517496..205931c8c 100644 --- a/site/profile/manifests/users.pp +++ b/site/profile/manifests/users.pp @@ -36,6 +36,7 @@ define profile::users::ldap_user ( Array[String] $groups, Array[String] $access_tags, + String $globus_id = "", Array[String] $public_keys = [], Integer[0] $count = 1, Boolean $manage_password = true,