Skip to content

Commit

Permalink
Merge pull request #1520 from lsst-it/IT-5665/ceph-tuning-elqui
Browse files Browse the repository at this point in the history
(cluster/elqui) misc tuning for ceph rgw
  • Loading branch information
jhoblitt authored Nov 4, 2024
2 parents 4e7a389 + 851e86d commit 750e8a7
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 1 deletion.
1 change: 1 addition & 0 deletions hieradata/cluster/elqui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ nm::connections:
bond:
miimon: "100"
mode: "802.3ad"
xmit_hash_policy: "layer3+4"
ipv4:
method: "disabled"
ipv6:
Expand Down
6 changes: 6 additions & 0 deletions hieradata/node/elqui06.cp.lsst.org.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
rke2::config:
node-label:
- "metallb/speaker=true"
node-taint:
- "metallb/speaker=true:NoExecute" # https://github.com/rancher/rke2/issues/7152
6 changes: 6 additions & 0 deletions hieradata/node/elqui07.cp.lsst.org.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
rke2::config:
node-label:
- "metallb/speaker=true"
node-taint:
- "metallb/speaker=true:NoExecute" # https://github.com/rancher/rke2/issues/7152
6 changes: 6 additions & 0 deletions hieradata/node/elqui08.cp.lsst.org.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
rke2::config:
node-label:
- "metallb/speaker=true"
node-taint:
- "metallb/speaker=true:NoExecute" # https://github.com/rancher/rke2/issues/7152
1 change: 1 addition & 0 deletions spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
it_behaves_like 'nm enabled interface'
it_behaves_like 'nm bond interface'
it_behaves_like 'nm no-ip interface'
it { expect(nm_keyfile['bond']['xmit_hash_policy']).to eq('layer3+4') }
end

Hash[*%w[
Expand Down
14 changes: 13 additions & 1 deletion spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,19 @@

it do
expect(catalogue.resource('class', 'rke2')[:config]).to include(
'node-label' => ['role=storage-node']
'node-label' => include('role=storage-node')
)
end

it do
expect(catalogue.resource('class', 'rke2')[:config]).to include(
'node-label' => include('metallb/speaker=true')
)
end

it do
expect(catalogue.resource('class', 'rke2')[:config]).to include(
'node-taint' => ['metallb/speaker=true:NoExecute']
)
end

Expand Down

0 comments on commit 750e8a7

Please sign in to comment.