Merge pull request #1907 from lsst-it/IT-6490_rke2_yepun

(cluster/yepun) convert rke1 -> rke2

Author: jhoblitt

hieradata/cluster/yepun.yaml

@@ -2,3 +2,96 @@
 clustershell::groupmembers:
   yepun: {group: "yepun", member: "yepun[01-05]"}
 tuned::active_profile: "latency-performance"
+nm::conf:
+  device:
+    keep-configuration: "no"
+    allowed-connections: "except:origin:nm-initrd-generator"
+
+nm::connections:
+  eno1np0:
+    content:
+      connection:
+        id: "eno1np0"
+        uuid: "3e516a55-fffc-44ab-828c-5ca7b17c7bbf"
+        type: "ethernet"
+        interface-name: "eno1np0"
+        master: "bond0"
+        slave-type: "bond"
+      ethernet: {}
+      ipv4:
+        method: "disabled"
+      ipv6:
+        method: "disabled"
+  eno2np1:
+    content:
+      connection:
+        id: "eno2np1"
+        uuid: "20178b7c-af05-4235-929b-fb2c4126e234"
+        type: "ethernet"
+        interface-name: "eno2np1"
+        master: "bond0"
+        slave-type: "bond"
+      ethernet: {}
+      ipv4:
+        method: "disabled"
+      ipv6:
+        method: "disabled"
+  bond0:
+    content:
+      connection:
+        id: "bond0"
+        uuid: "9dbf4a45-880a-491d-83cc-275db7197980"
+        type: "bond"
+        interface-name: "bond0"
+      ethernet:
+        cloned-mac-address: "%{facts.networking.interfaces.eno1np0.mac}"
+      bond:
+        mode: "802.3ad"
+        miimon: "100"
+        xmit_hash_policy: "layer3+4"
+      ipv4:
+        method: "disabled"
+      ipv6:
+        method: "disabled"
+  bond0.1101:
+    content:
+      connection:
+        id: "bond0.1101"
+        uuid: "4f98595d-f363-40f1-b4c1-5a87f63d0f4a"
+        type: "vlan"
+        interface-name: "bond0.1101"
+        master: "br1101"
+        slave-type: "bridge"
+      ethernet: {}
+      vlan:
+        flags: "1"
+        id: "1101"
+        parent: "bond0"
+      bridge-port: {}
+  br1101:
+    content:
+      connection:
+        id: "br1101"
+        uuid: "b5c7a6ef-b449-4729-b944-ec45c40b40cc"
+        type: "bridge"
+        interface-name: "br1101"
+      ethernet: {}
+      bridge:
+        stp: "false"
+      ipv4:
+        method: "auto"
+      ipv6:
+        method: "disabled"
+      proxy: {}
+  enp71s0f3u1u1c2:
+    content:
+      connection:
+        id: "enp71s0f3u1u1c2"
+        type: "ethernet"
+        autoconnect: "false"
+        interface-name: "enp71s0f3u1u1c2"
+      ethernet: {}
+      ipv4:
+        method: "disabled"
+      ipv6:
+        method: "disabled"

hieradata/cluster/yepun/role/rke2server.yaml

@@ -0,0 +1,7 @@
+---
+classes:
+  - "profile::core::sysctl::rp_filter"
+profile::core::sysctl::rp_filter::enable: false
+rke2::config:
+  node-label:
+    - "role=storage-node"

spec/hosts/nodes/yepun01.cp.lsst.org_spec.rb

@@ -22,15 +22,14 @@
       end
       let(:node_params) do
         {
-          role: 'rke',
+          role: 'rke2server',
           site: 'cp',
           cluster: 'yepun',
         }
       end
 
       it { is_expected.to compile.with_all_deps }
 
-      include_examples 'docker', docker_version: '25.0.3'
       include_examples 'baremetal'
       include_context 'with nm interface'
       include_examples 'ceph cluster'
@@ -47,13 +46,86 @@
       end
 
       it do
-        is_expected.to contain_class('rke').with(
-          version: '1.8.0',
-          checksum: '8815da0452ae14a45566b534c48a2af6286ee73f800208ba6ec59188cb9a8d25'
+        is_expected.to contain_class('rke2').with(
+          node_type: 'server',
+          release_series: '1.32',
+          version: '1.32.2~rke2r1'
         )
       end
 
-      it { is_expected.to have_nm__connection_resource_count(0) }
+      it do
+        expect(catalogue.resource('class', 'nm')[:conf]).to include(
+          'device' => {
+            'keep-configuration' => 'no',
+            'allowed-connections' => 'except:origin:nm-initrd-generator',
+          }
+        )
+      end
+
+      it { is_expected.to have_nm__connection_resource_count(6) }
+
+      %w[
+        enp71s0f3u1u1c2
+      ].each do |i|
+        context "with #{i}" do
+          let(:interface) { i }
+
+          it_behaves_like 'nm disabled interface'
+        end
+      end
+
+      %w[
+        eno1np0
+        eno2np1
+      ].each do |i|
+        context "with #{i}" do
+          let(:interface) { i }
+
+          it_behaves_like 'nm named interface'
+          it_behaves_like 'nm ethernet interface'
+          it_behaves_like 'nm no-ip interface'
+          it { expect(nm_keyfile['connection']['master']).to eq('bond0') }
+          it { expect(nm_keyfile['connection']['slave-type']).to eq('bond') }
+          it { expect(nm_keyfile_raw).to match(%r{^\[ethernet\]$}) }
+          it { expect(nm_keyfile_raw).to match(%r{^\[ipv4\]$}) }
+          it { expect(nm_keyfile_raw).to match(%r{^\[ipv6\]$}) }
+        end
+      end
+
+      context 'with bond0' do
+        let(:interface) { 'bond0' }
+
+        it_behaves_like 'nm named interface'
+        it_behaves_like 'nm no-ip interface'
+        it { expect(nm_keyfile['connection']['type']).to eq('bond') }
+        it { expect(nm_keyfile['bond']['miimon']).to eq(100) }
+        it { expect(nm_keyfile['bond']['mode']).to eq('802.3ad') }
+        it { expect(nm_keyfile['bond']['xmit_hash_policy']).to eq('layer3+4') }
+        it { expect(nm_keyfile_raw).to match(%r{^\[ethernet\]$}) }
+        it { expect(nm_keyfile_raw).not_to match(%r{^\[proxy\]$}) }
+      end
+
+      %w[
+        1101
+      ].each do |vlan|
+        iface = "bond0.#{vlan}"
+
+        context "with #{iface}" do
+          let(:interface) { iface }
+
+          it_behaves_like 'nm enabled interface'
+          it_behaves_like 'nm vlan interface', id: vlan.to_i, parent: 'bond0'
+          it_behaves_like 'nm bridge slave interface', master: "br#{vlan}"
+        end
+      end
+
+      context 'with br1101' do
+        let(:interface) { 'br1101' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm bridge interface'
+        it_behaves_like 'nm dhcp interface'
+      end
     end # on os
   end # on_supported_os
 end