Skip to content

Commit 9181bf0

Browse files
committed
(site/ls) add RKE2 roles to GAW
1 parent 803166c commit 9181bf0

File tree

4 files changed

+90
-5
lines changed

4 files changed

+90
-5
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
classes:
3+
- "profile::core::sysctl::rp_filter"
4+
profile::core::sysctl::rp_filter::enable: false
5+
rke2::config:
6+
node-label:
7+
- "role=storage-node"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
classes:
3+
- "profile::core::sysctl::rp_filter"
4+
profile::core::sysctl::rp_filter::enable: false
5+
rke2::config:
6+
node-label:
7+
- "role=storage-node"

spec/hosts/nodes/gaw01.ls.lsst.org_spec.rb

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
end
2323
let(:node_params) do
2424
{
25-
role: 'rke',
25+
role: 'rke2server',
2626
site: 'ls',
2727
cluster: 'gaw',
2828
}
@@ -33,7 +33,12 @@
3333
include_examples 'baremetal'
3434
include_context 'with nm interface'
3535
include_examples 'ceph cluster'
36-
include_examples 'docker', docker_version: '24.0.9'
36+
37+
it do
38+
expect(catalogue.resource('class', 'rke2')[:config]).to include(
39+
'node-label' => ['role=storage-node']
40+
)
41+
end
3742

3843
it do
3944
is_expected.to contain_class('clustershell').with(
@@ -47,9 +52,10 @@
4752
end
4853

4954
it do
50-
is_expected.to contain_class('rke').with(
51-
version: '1.7.7',
52-
checksum: '4317d54ed5251d71c82b631083907c526dc74808941deebc392369108b7a4b10'
55+
is_expected.to contain_class('rke2').with(
56+
node_type: 'server',
57+
release_series: '1.31',
58+
version: '1.31.8~rke2r1'
5359
)
5460
end
5561

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# frozen_string_literal: true
2+
3+
require 'spec_helper'
4+
5+
describe 'gaw04.ls.lsst.org', :sitepp do
6+
on_supported_os.each do |os, os_facts|
7+
next unless os =~ %r{almalinux-9-x86_64}
8+
9+
context "on #{os}" do
10+
let(:facts) do
11+
lsst_override_facts(os_facts,
12+
is_virtual: false,
13+
virtual: 'physical',
14+
dmi: {
15+
'product' => {
16+
'name' => 'Super Server',
17+
},
18+
'board' => {
19+
'product' => 'H12SSL-NT',
20+
},
21+
})
22+
end
23+
let(:node_params) do
24+
{
25+
role: 'rke2agent',
26+
site: 'ls',
27+
cluster: 'gaw',
28+
}
29+
end
30+
31+
it { is_expected.to compile.with_all_deps }
32+
33+
include_examples 'baremetal'
34+
include_context 'with nm interface'
35+
include_examples 'ceph cluster'
36+
37+
it do
38+
expect(catalogue.resource('class', 'rke2')[:config]).to include(
39+
'node-label' => ['role=storage-node']
40+
)
41+
end
42+
43+
it do
44+
is_expected.to contain_class('clustershell').with(
45+
groupmembers: {
46+
'gaw' => {
47+
'group' => 'gaw',
48+
'member' => 'gaw[01-05]',
49+
},
50+
}
51+
)
52+
end
53+
54+
it do
55+
is_expected.to contain_class('rke2').with(
56+
node_type: 'agent',
57+
release_series: '1.31',
58+
version: '1.31.8~rke2r1'
59+
)
60+
end
61+
62+
it { is_expected.to have_nm__connection_resource_count(0) }
63+
end # on os
64+
end # on_supported_os
65+
end

0 commit comments

Comments
 (0)