Skip to content

Commit 3306b6d

Browse files
Merge pull request #1808 from lsst-it/IT-6026_update_perfsonar_toolkit
(role/perfsonar) update toolkit config
2 parents aada8a6 + 4b47c44 commit 3306b6d

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

hieradata/role/perfsonar.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ classes:
1010
# ensure chrony is not running
1111
profile::core::common::manage_chrony: true
1212
profile::core::sysctl::rp_filter::enable: false
13-
profile::core::perfsonar::version: "5.0.8"
13+
profile::core::perfsonar::version: "5.1.4"
1414

1515
firewall::ensure: "running"
1616
profile::core::firewall::firewall:
@@ -35,8 +35,9 @@ files:
3535
perfsonar::manage_pscheduler_agent: true
3636
perfsonar::pscheduler_agent_config:
3737
remotes:
38-
- url: "http://pwa.ampath.net/pub/config/new-lsst-scl-lsc"
38+
- url: "https://ps-cma.amlight.net/psconfig/lhn-psconfig.json"
3939
configure-archives: true
40+
4041
perfsonar::manage_lsregistrationdaemon: true
4142
perfsonar::lsregistrationdaemon_ensure: "stopped"
4243
perfsonar::lsregistrationdaemon_enable: false

spec/hosts/roles/perfsonar_spec.rb

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
describe "#{role} role" do
88
on_supported_os.each do |os, os_facts|
9-
next if os =~ %r{almalinux-8-x86_64}
9+
next unless os =~ %r{almalinux-9-x86_64}
1010

1111
context "on #{os}" do
1212
lsst_sites.each do |site|
@@ -20,7 +20,7 @@
2020
let(:facts) { lsst_override_facts(os_facts) }
2121

2222
let(:le_root) { "/etc/letsencrypt/live/#{facts[:networking]['fqdn']}" }
23-
let(:perfsonar_version) { '5.0.8' }
23+
let(:perfsonar_version) { '5.1.4' }
2424

2525
it { is_expected.to compile.with_all_deps }
2626

@@ -36,6 +36,22 @@
3636
)
3737
end
3838

39+
it do
40+
is_expected.to contain_file('/etc/perfsonar/psconfig/pscheduler-agent.json').with(
41+
ensure: 'file',
42+
content: <<~JSON
43+
{
44+
"remotes": [
45+
{
46+
"url": "https://ps-cma.amlight.net/psconfig/lhn-psconfig.json",
47+
"configure-archives": true
48+
}
49+
]
50+
}
51+
JSON
52+
)
53+
end
54+
3955
it do
4056
is_expected.to contain_firewall('400 accept ssh').with(
4157
proto: 'tcp',

0 commit comments

Comments
 (0)