Skip to content

Commit

Permalink
Point to the C3G globus puppet repo (#5)
Browse files Browse the repository at this point in the history
* Update treydock-globus to 10.0.0

* Add dependencies for poquirion/puppet-module-globus

* point to C3G globus in Puppetfile
  • Loading branch information
poquirion committed Mar 18, 2024
1 parent d474fb9 commit 7ee0020
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 13 deletions.
4 changes: 3 additions & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
39 changes: 27 additions & 12 deletions site/profile/manifests/globus.pp
Original file line number Diff line number Diff line change
@@ -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")

Check warning on line 13 in site/profile/manifests/globus.pp

View workflow job for this annotation

GitHub Actions / build

double quoted string containing no variables (check: double_quoted_strings)

class { 'globus':
display_name => $display_name,

Check warning on line 16 in site/profile/manifests/globus.pp

View workflow job for this annotation

GitHub Actions / build

indentation of => is not properly aligned (expected in column 17, but found it in column 18) (check: arrow_alignment)
organization => $organization,

Check warning on line 17 in site/profile/manifests/globus.pp

View workflow job for this annotation

GitHub Actions / build

indentation of => is not properly aligned (expected in column 17, but found it in column 18) (check: arrow_alignment)
owner => $owner,

Check warning on line 18 in site/profile/manifests/globus.pp

View workflow job for this annotation

GitHub Actions / build

indentation of => is not properly aligned (expected in column 17, but found it in column 18) (check: arrow_alignment)
contact_email => $contact_email,

Check warning on line 19 in site/profile/manifests/globus.pp

View workflow job for this annotation

GitHub Actions / build

indentation of => is not properly aligned (expected in column 17, but found it in column 18) (check: arrow_alignment)
ip_address => $public_ip,
users => $users

Check warning on line 21 in site/profile/manifests/globus.pp

View workflow job for this annotation

GitHub Actions / build

indentation of => is not properly aligned (expected in column 17, but found it in column 9) (check: arrow_alignment)
}

# 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'],
# }
}
1 change: 1 addition & 0 deletions site/profile/manifests/users.pp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
define profile::users::ldap_user (
Array[String] $groups,
Array[String] $access_tags,
String $globus_id = "",

Check warning on line 39 in site/profile/manifests/users.pp

View workflow job for this annotation

GitHub Actions / build

double quoted string containing no variables (check: double_quoted_strings)
Array[String] $public_keys = [],
Integer[0] $count = 1,
Boolean $manage_password = true,
Expand Down

0 comments on commit 7ee0020

Please sign in to comment.