Merge pull request #1624 from lsst-it/IT-5910_deploy_nodes_kueyen

(kueyen) Add more nodes. Add a variant for new nodes.

Author: gseriche

hieradata/cluster/kueyen.yaml

@@ -1,6 +1,10 @@
 ---
 clustershell::groupmembers:
-  kueyen: {group: "kueyen", member: "kueyen[01-03]"}
+  kueyen:
+    group: "kueyen"
+    member:
+      - "kueyen[01-03]"
+      - "kueyen[04-09]"
 profile::core::ospl::enable_rundir: true
 profile::core::k8snode::enable_dhcp: true
 tuned::active_profile: "latency-performance"

hieradata/cluster/kueyen/variant/c6420.yaml

@@ -0,0 +1,29 @@
+---
+nm::connections:
+  ens4f0:
+    content:
+      connection:
+        id: "ens4f0"
+        uuid: "46d19ce1-bcab-7e77-6fc7-b730b26c54b1"
+        type: "ethernet"
+        interface-name: "ens4f0"
+      ethernet: {}
+      ipv4:
+        method: "auto"
+      ipv6:
+        method: "disabled"
+  ens4f0.2301:
+    content:
+      connection:
+        id: "ens4f0.2301"
+        uuid: "e74daaad-4d73-4015-bb26-83c460ddf572"
+        type: "vlan"
+        interface-name: "ens4f0.2301"
+        master: "br2301"
+        slave-type: "bridge"
+      ethernet: {}
+      vlan:
+        flags: "1"
+        id: "2301"
+        parent: "ens4f0"
+      bridge-port: {}

hieradata/cluster/kueyen/variant/r440.yaml

@@ -0,0 +1,42 @@
+---
+nm::connections:
+  ens2f1:
+    content:
+      connection:
+        id: "ens2f1"
+        uuid: "de9904c8-9577-1a17-36b1-34b94132f06a"
+        type: "ethernet"
+        interface-name: "ens2f1"
+      ethernet: {}
+      ipv4:
+        method: "auto"
+      ipv6:
+        method: "disabled"
+  ens2f0:
+    content:
+      connection:
+        id: "ens2f0"
+        uuid: "46d19ce1-bcab-7e77-6fc7-b730b26c54b1"
+        type: "ethernet"
+        autoconnect: "false"
+        interface-name: "ens2f0"
+      ethernet: {}
+      ipv4:
+        method: "disabled"
+      ipv6:
+        method: "disabled"
+  ens2f0.2301:
+    content:
+      connection:
+        id: "ens2f0.2301"
+        uuid: "87823dc2-278d-4ee5-a55a-3730b856141c"
+        type: "vlan"
+        interface-name: "ens2f0.2301"
+        master: "br2301"
+        slave-type: "bridge"
+      ethernet: {}
+      vlan:
+        flags: "1"
+        id: "2301"
+        parent: "ens2f0"
+      bridge-port: {}

spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb

@@ -41,7 +41,10 @@
           groupmembers: {
             'kueyen' => {
               'group' => 'kueyen',
-              'member' => 'kueyen[01-03]',
+              'member' => [
+                'kueyen[01-03]',
+                'kueyen[04-09]'
+              ],
             },
           }
         )

spec/hosts/nodes/kueyen04.dev.lsst.org_spec.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'kueyen04.dev.lsst.org', :sitepp do
+  on_supported_os.each do |os, os_facts|
+    next unless os =~ %r{almalinux-9-x86_64}
+
+    context "on #{os}" do
+      let(:facts) do
+        lsst_override_facts(os_facts,
+                            is_virtual: false,
+                            virtual: 'physical',
+                            dmi: {
+                              'product' => {
+                                'name' => 'PowerEdge C6420',
+                              },
+                            })
+      end
+      let(:node_params) do
+        {
+          role: 'rke',
+          site: 'dev',
+          cluster: 'kueyen',
+          variant: 'c6420',
+        }
+      end
+
+      it { is_expected.to compile.with_all_deps }
+
+      # include_examples 'docker', docker_version: '24.0.9'
+      include_examples 'baremetal'
+      include_examples 'ceph cluster'
+      include_context 'with nm interface'
+
+      it do
+        is_expected.to contain_class('profile::core::sysctl::rp_filter').with_enable(false)
+      end
+
+      it do
+        is_expected.to contain_class('clustershell').with(
+          groupmembers: {
+            'kueyen' => {
+              'group' => 'kueyen',
+              'member' => [
+                'kueyen[01-03]',
+                'kueyen[04-09]'
+              ],
+            },
+          }
+        )
+      end
+
+      it do
+        is_expected.to contain_class('rke').with(
+          version: '1.6.5'
+        )
+      end
+
+      it do
+        is_expected.to contain_class('cni::plugins').with(
+          version: '1.2.0',
+          checksum: 'f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37',
+          enable: %w[macvlan static]
+        )
+      end
+
+      it { is_expected.to contain_class('cni::plugins::dhcp') }
+
+      it { is_expected.to contain_class('profile::core::ospl').with_enable_rundir(true) }
+
+      it { is_expected.to have_nm__connection_resource_count(8) }
+
+      %w[
+        em1
+        em2
+        ens2f0
+      ].each do |i|
+        context "with #{i}" do
+          let(:interface) { i }
+
+          it_behaves_like 'nm disabled interface'
+        end
+      end
+
+      context 'with ens4f0' do
+        let(:interface) { 'ens4f0' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm dhcp interface'
+        it_behaves_like 'nm ethernet interface'
+      end
+
+      context 'with ens4f0.2301' do
+        let(:interface) { 'ens4f0.2301' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm vlan interface', id: 2301, parent: 'ens4f0'
+        it_behaves_like 'nm bridge slave interface', master: 'br2301'
+      end
+
+      context 'with br2301' do
+        let(:interface) { 'br2301' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm dhcp interface'
+        it_behaves_like 'nm bridge interface'
+      end
+    end # on os
+  end # on_supported_os
+end