diff --git a/hieradata/cluster/elqui.yaml b/hieradata/cluster/elqui.yaml index f55ab7e87c..2dcedf7d3c 100644 --- a/hieradata/cluster/elqui.yaml +++ b/hieradata/cluster/elqui.yaml @@ -80,6 +80,7 @@ nm::connections: bond: miimon: "100" mode: "802.3ad" + xmit_hash_policy: "layer3+4" ipv4: method: "disabled" ipv6: diff --git a/hieradata/node/elqui06.cp.lsst.org.yaml b/hieradata/node/elqui06.cp.lsst.org.yaml new file mode 100644 index 0000000000..f0c08e06c0 --- /dev/null +++ b/hieradata/node/elqui06.cp.lsst.org.yaml @@ -0,0 +1,6 @@ +--- +rke2::config: + node-label: + - "metallb/speaker=true" + node-taint: + - "metallb/speaker=true:NoExecute" # https://github.com/rancher/rke2/issues/7152 diff --git a/hieradata/node/elqui07.cp.lsst.org.yaml b/hieradata/node/elqui07.cp.lsst.org.yaml new file mode 100644 index 0000000000..f0c08e06c0 --- /dev/null +++ b/hieradata/node/elqui07.cp.lsst.org.yaml @@ -0,0 +1,6 @@ +--- +rke2::config: + node-label: + - "metallb/speaker=true" + node-taint: + - "metallb/speaker=true:NoExecute" # https://github.com/rancher/rke2/issues/7152 diff --git a/hieradata/node/elqui08.cp.lsst.org.yaml b/hieradata/node/elqui08.cp.lsst.org.yaml new file mode 100644 index 0000000000..f0c08e06c0 --- /dev/null +++ b/hieradata/node/elqui08.cp.lsst.org.yaml @@ -0,0 +1,6 @@ +--- +rke2::config: + node-label: + - "metallb/speaker=true" + node-taint: + - "metallb/speaker=true:NoExecute" # https://github.com/rancher/rke2/issues/7152 diff --git a/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb b/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb index dd48c89ae1..79ef4a6769 100644 --- a/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb @@ -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[ diff --git a/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb b/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb index 8059aa8001..c73e8cb62a 100644 --- a/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb @@ -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