From b535cd8b298c51cb79bd874842d63c3c055f01b8 Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <josh@hoblitt.com>
Date: Fri, 13 Sep 2024 12:20:26 -0700
Subject: [PATCH] (.rubocop.yml) set target ruby version to 3.2

---
 .rubocop.yml                                  |  2 ++
 spec/classes/ccs/graphical_spec.rb            |  2 +-
 spec/classes/core/bash_completion_spec.rb     |  2 +-
 spec/classes/core/gpio_spec.rb                |  2 +-
 spec/classes/core/i2c_spec.rb                 |  2 +-
 spec/classes/core/krb5_spec.rb                |  2 +-
 spec/classes/core/perfsonar_spec.rb           |  4 ++--
 spec/classes/core/x2go_spec.rb                |  2 +-
 spec/classes/nfs/v2_spec.rb                   |  2 +-
 spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb  |  2 +-
 spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb  |  2 +-
 spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb |  2 +-
 spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb |  2 +-
 spec/hosts/roles/allsky_cam_spec.rb           |  6 +++---
 spec/hosts/roles/amor_spec.rb                 |  6 +++---
 spec/hosts/roles/atsccs_spec.rb               |  8 ++++----
 spec/hosts/roles/atsdaq_spec.rb               |  8 ++++----
 spec/hosts/roles/atshcu_spec.rb               | 12 ++++++------
 spec/hosts/roles/auxtel_archiver_spec.rb      |  6 +++---
 spec/hosts/roles/auxtel_vent_gate_spec.rb     | 10 +++++-----
 spec/hosts/roles/bastion_spec.rb              |  8 ++++----
 spec/hosts/roles/catchall_spec.rb             |  6 +++---
 spec/hosts/roles/ccs_dc_spec.rb               | 10 +++++-----
 spec/hosts/roles/ccs_desktop_spec.rb          | 10 +++++-----
 spec/hosts/roles/ccs_hcu_spec.rb              | 10 +++++-----
 spec/hosts/roles/ccs_mcm_spec.rb              | 12 ++++++------
 spec/hosts/roles/ccs_viswork_spec.rb          | 10 +++++-----
 spec/hosts/roles/cmms_spec.rb                 |  4 ++--
 spec/hosts/roles/comcam_archiver_spec.rb      |  6 +++---
 spec/hosts/roles/comcam_fp_spec.rb            |  8 ++++----
 spec/hosts/roles/daq_mgt_spec.rb              | 10 +++++-----
 spec/hosts/roles/dco_spec.rb                  |  6 +++---
 spec/hosts/roles/dimm_spec.rb                 |  6 +++---
 spec/hosts/roles/dm_bastion_spec.rb           |  6 +++---
 spec/hosts/roles/dnscache_spec.rb             |  6 +++---
 spec/hosts/roles/docker_compose_spec.rb       |  6 +++---
 spec/hosts/roles/dtn_spec.rb                  |  6 +++---
 spec/hosts/roles/ess_spec.rb                  |  6 +++---
 spec/hosts/roles/fiberspec_spec.rb            |  6 +++---
 spec/hosts/roles/foreman_spec.rb              | 12 ++++++------
 spec/hosts/roles/generic_spec.rb              |  6 +++---
 spec/hosts/roles/hexrot_spec.rb               |  8 ++++----
 spec/hosts/roles/htcondor_spec.rb             |  4 ++--
 spec/hosts/roles/hvac_spec.rb                 |  8 ++++----
 spec/hosts/roles/hypervisor_spec.rb           |  6 +++---
 spec/hosts/roles/ipareplica_spec.rb           |  8 ++++----
 spec/hosts/roles/it_ansible_spec.rb           |  6 +++---
 spec/hosts/roles/laserrpi_spec.rb             |  8 ++++----
 spec/hosts/roles/logictimer_spec.rb           |  8 ++++----
 spec/hosts/roles/m1m3_spec.rb                 |  8 ++++----
 spec/hosts/roles/m2_spec.rb                   |  8 ++++----
 spec/hosts/roles/nfsserver_spec.rb            |  6 +++---
 spec/hosts/roles/perfsonar_spec.rb            | 12 ++++++------
 spec/hosts/roles/puppetdb_spec.rb             | 10 +++++-----
 spec/hosts/roles/rke2agent_spec.rb            |  8 ++++----
 spec/hosts/roles/rke2server_spec.rb           |  8 ++++----
 spec/hosts/roles/rke_spec.rb                  |  8 ++++----
 spec/hosts/roles/sal_dx_spec.rb               |  8 ++++----
 spec/hosts/roles/tang_spec.rb                 | 10 +++++-----
 spec/hosts/roles/ubuntu_spec.rb               |  4 ++--
 spec/hosts/roles/vms-data_spec.rb             |  4 ++--
 spec/spec_helper.rb                           |  6 +++---
 spec/support/spec/dhcp.rb                     |  4 ++--
 63 files changed, 203 insertions(+), 201 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index bd832a760d..890444a2d2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,8 @@ inherit_gem:
 require:
   - rubocop-rspec
   - rubocop-rake
+AllCops:
+  TargetRubyVersion: '3.2'
 Layout/DotPosition:
   EnforcedStyle: leading
 Style/CommentedKeyword:
diff --git a/spec/classes/ccs/graphical_spec.rb b/spec/classes/ccs/graphical_spec.rb
index 96e7119f2b..0bcf791a05 100644
--- a/spec/classes/ccs/graphical_spec.rb
+++ b/spec/classes/ccs/graphical_spec.rb
@@ -22,7 +22,7 @@
 
       it { is_expected.to compile.with_all_deps }
 
-      include_examples 'x2go packages', os_facts: os_facts
+      include_examples('x2go packages', os_facts:)
 
       if os_facts[:os]['release']['major'] == '7'
         it do
diff --git a/spec/classes/core/bash_completion_spec.rb b/spec/classes/core/bash_completion_spec.rb
index a48a8f4a82..9d6d9d10c8 100644
--- a/spec/classes/core/bash_completion_spec.rb
+++ b/spec/classes/core/bash_completion_spec.rb
@@ -9,7 +9,7 @@
 
       it { is_expected.to compile.with_all_deps }
 
-      include_examples 'bash_completion', os_facts: os_facts
+      include_examples 'bash_completion', os_facts:
     end
   end
 end
diff --git a/spec/classes/core/gpio_spec.rb b/spec/classes/core/gpio_spec.rb
index 5e5f1819fa..9b10f1e2f0 100644
--- a/spec/classes/core/gpio_spec.rb
+++ b/spec/classes/core/gpio_spec.rb
@@ -9,7 +9,7 @@
 
       it { is_expected.to compile.with_all_deps }
 
-      include_examples 'gpio', os_facts: os_facts
+      include_examples 'gpio', os_facts:
     end
   end
 end
diff --git a/spec/classes/core/i2c_spec.rb b/spec/classes/core/i2c_spec.rb
index 863b8de01a..4883ebe722 100644
--- a/spec/classes/core/i2c_spec.rb
+++ b/spec/classes/core/i2c_spec.rb
@@ -14,7 +14,7 @@
 
       it { is_expected.to compile.with_all_deps }
 
-      include_examples 'i2c', os_facts: os_facts
+      include_examples 'i2c', os_facts:
     end
   end
 end
diff --git a/spec/classes/core/krb5_spec.rb b/spec/classes/core/krb5_spec.rb
index ce9315a8f8..f5e5930608 100644
--- a/spec/classes/core/krb5_spec.rb
+++ b/spec/classes/core/krb5_spec.rb
@@ -10,7 +10,7 @@
       context 'with no params' do
         it { is_expected.to compile.with_all_deps }
 
-        include_examples 'krb5.conf.d files', os_facts: os_facts
+        include_examples 'krb5.conf.d files', os_facts:
       end
     end
   end
diff --git a/spec/classes/core/perfsonar_spec.rb b/spec/classes/core/perfsonar_spec.rb
index 3401b6ce50..22f2e5e045 100644
--- a/spec/classes/core/perfsonar_spec.rb
+++ b/spec/classes/core/perfsonar_spec.rb
@@ -11,7 +11,7 @@
 
       it { is_expected.to compile.with_all_deps }
 
-      include_examples 'generic perfsonar', os_facts: os_facts
+      include_examples('generic perfsonar', os_facts:)
 
       context 'with version param' do
         context 'with 5.0.0' do
@@ -22,7 +22,7 @@
             }
           end
 
-          include_examples 'generic perfsonar', os_facts: os_facts
+          include_examples 'generic perfsonar', os_facts:
         end
       end
     end
diff --git a/spec/classes/core/x2go_spec.rb b/spec/classes/core/x2go_spec.rb
index 7395b7ddfb..53681967ce 100644
--- a/spec/classes/core/x2go_spec.rb
+++ b/spec/classes/core/x2go_spec.rb
@@ -17,7 +17,7 @@
       context 'with no parameters' do
         it { is_expected.to compile.with_all_deps }
 
-        include_examples 'x2go packages', os_facts: os_facts
+        include_examples('x2go packages', os_facts:)
 
         it do
           is_expected.to contain_file('/etc/sudoers.d/x2goserver')
diff --git a/spec/classes/nfs/v2_spec.rb b/spec/classes/nfs/v2_spec.rb
index cba8bac353..6c025f7011 100644
--- a/spec/classes/nfs/v2_spec.rb
+++ b/spec/classes/nfs/v2_spec.rb
@@ -7,7 +7,7 @@
     context "on #{os}" do
       let(:facts) { os_facts }
 
-      include_examples 'nfsv2 enabled', os_facts: os_facts
+      include_examples 'nfsv2 enabled', os_facts:
     end
   end
 end
diff --git a/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb b/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb
index e3cb1ac796..563ed80723 100644
--- a/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb
+++ b/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb
@@ -111,7 +111,7 @@
           let(:interface) { slave }
 
           it_behaves_like 'nm enabled interface'
-          it_behaves_like 'nm bridge slave interface', master: master
+          it_behaves_like 'nm bridge slave interface', master:
         end
       end
 
diff --git a/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb b/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb
index bd08e449af..1d3b30c94a 100644
--- a/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb
+++ b/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb
@@ -110,7 +110,7 @@
           let(:interface) { slave }
 
           it_behaves_like 'nm enabled interface'
-          it_behaves_like 'nm bridge slave interface', master: master
+          it_behaves_like 'nm bridge slave interface', master:
         end
       end
 
diff --git a/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb
index 6b17a43a8f..f612ee71a1 100644
--- a/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb
+++ b/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb
@@ -98,7 +98,7 @@
           let(:interface) { slave }
 
           it_behaves_like 'nm enabled interface'
-          it_behaves_like 'nm bridge slave interface', master: master
+          it_behaves_like 'nm bridge slave interface', master:
         end
       end
 
diff --git a/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb
index de0411b5d9..c40a365656 100644
--- a/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb
+++ b/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb
@@ -102,7 +102,7 @@
           let(:interface) { slave }
 
           it_behaves_like 'nm enabled interface'
-          it_behaves_like 'nm bridge slave interface', master: master
+          it_behaves_like 'nm bridge slave interface', master:
         end
       end
 
diff --git a/spec/hosts/roles/allsky_cam_spec.rb b/spec/hosts/roles/allsky_cam_spec.rb
index 1f14162fe4..ce8132368a 100644
--- a/spec/hosts/roles/allsky_cam_spec.rb
+++ b/spec/hosts/roles/allsky_cam_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) do
@@ -29,7 +29,7 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           it { is_expected.to contain_package('libgphoto2') }
         end # host
       end # lsst_sites
diff --git a/spec/hosts/roles/amor_spec.rb b/spec/hosts/roles/amor_spec.rb
index 8d203403f5..c1406efeee 100644
--- a/spec/hosts/roles/amor_spec.rb
+++ b/spec/hosts/roles/amor_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
               cluster: role,
             }
           end
@@ -20,7 +20,7 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'docker'
           include_examples 'dco'
 
diff --git a/spec/hosts/roles/atsccs_spec.rb b/spec/hosts/roles/atsccs_spec.rb
index b6669f9d83..1af22578e4 100644
--- a/spec/hosts/roles/atsccs_spec.rb
+++ b/spec/hosts/roles/atsccs_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
               cluster: 'auxtel-ccs',
             }
           end
@@ -20,8 +20,8 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'ccs common', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('ccs common', os_facts:)
           include_examples 'lhn sysctls'
           it { is_expected.to contain_class('ccs_sal') }
         end # host
diff --git a/spec/hosts/roles/atsdaq_spec.rb b/spec/hosts/roles/atsdaq_spec.rb
index 7025244e02..654598bb00 100644
--- a/spec/hosts/roles/atsdaq_spec.rb
+++ b/spec/hosts/roles/atsdaq_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
               cluster: 'auxtel-ccs',
             }
           end
@@ -20,8 +20,8 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'ccs common', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('ccs common', os_facts:)
           include_examples 'lsst-daq sysctls'
         end # host
       end # lsst_sites
diff --git a/spec/hosts/roles/atshcu_spec.rb b/spec/hosts/roles/atshcu_spec.rb
index 24aeb6ad07..afa90681c2 100644
--- a/spec/hosts/roles/atshcu_spec.rb
+++ b/spec/hosts/roles/atshcu_spec.rb
@@ -11,18 +11,18 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'ccs common', os_facts: os_facts
-          include_examples 'x2go packages', os_facts: os_facts
-          include_examples 'gpio', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('ccs common', os_facts:)
+          include_examples('x2go packages', os_facts:)
+          include_examples('gpio', os_facts:)
           it { is_expected.to contain_class('ccs_hcu') }
         end # host
       end # lsst_sites
diff --git a/spec/hosts/roles/auxtel_archiver_spec.rb b/spec/hosts/roles/auxtel_archiver_spec.rb
index 05dde9aa37..5c4a752770 100644
--- a/spec/hosts/roles/auxtel_archiver_spec.rb
+++ b/spec/hosts/roles/auxtel_archiver_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'archiver'
           include_examples 'archive data auxtel'
 
diff --git a/spec/hosts/roles/auxtel_vent_gate_spec.rb b/spec/hosts/roles/auxtel_vent_gate_spec.rb
index 3feaaebb24..7e084ab288 100644
--- a/spec/hosts/roles/auxtel_vent_gate_spec.rb
+++ b/spec/hosts/roles/auxtel_vent_gate_spec.rb
@@ -13,8 +13,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) do
@@ -31,10 +31,10 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'docker'
-          include_examples 'gpio', os_facts: os_facts
-          include_examples 'i2c', os_facts: os_facts
+          include_examples('gpio', os_facts:)
+          include_examples('i2c', os_facts:)
           include_examples 'darkmode'
           include_examples 'ftdi'
           include_examples 'pigpio'
diff --git a/spec/hosts/roles/bastion_spec.rb b/spec/hosts/roles/bastion_spec.rb
index 76ea10dcba..d159ddda24 100644
--- a/spec/hosts/roles/bastion_spec.rb
+++ b/spec/hosts/roles/bastion_spec.rb
@@ -11,16 +11,16 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('x2go packages', os_facts:)
           it { is_expected.to contain_class('mate') }
 
           %w[
diff --git a/spec/hosts/roles/catchall_spec.rb b/spec/hosts/roles/catchall_spec.rb
index 481326bcca..8cba506976 100644
--- a/spec/hosts/roles/catchall_spec.rb
+++ b/spec/hosts/roles/catchall_spec.rb
@@ -23,15 +23,15 @@ def roles_without_spec
           describe "#{role}.#{site}.lsst.org", :sitepp do
             let(:node_params) do
               {
-                role: role,
-                site: site,
+                role:,
+                site:,
               }
             end
             let(:facts) { lsst_override_facts(os_facts) }
 
             it { is_expected.to compile.with_all_deps }
 
-            include_examples 'common', os_facts: os_facts, site: site
+            include_examples 'common', os_facts:, site:
           end # host
         end # site
       end # on os
diff --git a/spec/hosts/roles/ccs_dc_spec.rb b/spec/hosts/roles/ccs_dc_spec.rb
index 85582a6c4e..27971282ee 100644
--- a/spec/hosts/roles/ccs_dc_spec.rb
+++ b/spec/hosts/roles/ccs_dc_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
               cluster: 'comcam-ccs',
             }
           end
@@ -20,9 +20,9 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'ccs common', os_facts: os_facts
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('ccs common', os_facts:)
+          include_examples('x2go packages', os_facts:)
           include_examples 'lhn sysctls'
 
           %w[
diff --git a/spec/hosts/roles/ccs_desktop_spec.rb b/spec/hosts/roles/ccs_desktop_spec.rb
index 081e07b0bb..4355ae659b 100644
--- a/spec/hosts/roles/ccs_desktop_spec.rb
+++ b/spec/hosts/roles/ccs_desktop_spec.rb
@@ -11,17 +11,17 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'ccs common', os_facts: os_facts
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('ccs common', os_facts:)
+          include_examples 'x2go packages', os_facts:
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/ccs_hcu_spec.rb b/spec/hosts/roles/ccs_hcu_spec.rb
index 4122e3aea2..2e19891bea 100644
--- a/spec/hosts/roles/ccs_hcu_spec.rb
+++ b/spec/hosts/roles/ccs_hcu_spec.rb
@@ -11,17 +11,17 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'ccs common', os_facts: os_facts
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('ccs common', os_facts:)
+          include_examples('x2go packages', os_facts:)
           it { is_expected.to contain_class('ccs_hcu') }
         end # host
       end # lsst_sites
diff --git a/spec/hosts/roles/ccs_mcm_spec.rb b/spec/hosts/roles/ccs_mcm_spec.rb
index 7d77ff48e6..b7f6cef52b 100644
--- a/spec/hosts/roles/ccs_mcm_spec.rb
+++ b/spec/hosts/roles/ccs_mcm_spec.rb
@@ -16,18 +16,18 @@
             describe "#{role}.#{site}.lsst.org", :sitepp do
               let(:node_params) do
                 {
-                  role: role,
-                  site: site,
-                  cluster: cluster,
+                  role:,
+                  site:,
+                  cluster:,
                 }
               end
               let(:facts) { lsst_override_facts(os_facts) }
 
               it { is_expected.to compile.with_all_deps }
 
-              include_examples 'common', os_facts: os_facts, site: site
-              include_examples 'ccs common', os_facts: os_facts
-              include_examples 'x2go packages', os_facts: os_facts
+              include_examples('common', os_facts:, site:)
+              include_examples('ccs common', os_facts:)
+              include_examples 'x2go packages', os_facts:
             end # host
           end # lsst_sites
         end # cluster
diff --git a/spec/hosts/roles/ccs_viswork_spec.rb b/spec/hosts/roles/ccs_viswork_spec.rb
index 33a3bf232c..2ca5dd61f5 100644
--- a/spec/hosts/roles/ccs_viswork_spec.rb
+++ b/spec/hosts/roles/ccs_viswork_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
 
@@ -20,9 +20,9 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'ccs common', os_facts: os_facts
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('ccs common', os_facts:)
+          include_examples 'x2go packages', os_facts:
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/cmms_spec.rb b/spec/hosts/roles/cmms_spec.rb
index c256e9f1ad..f415767749 100644
--- a/spec/hosts/roles/cmms_spec.rb
+++ b/spec/hosts/roles/cmms_spec.rb
@@ -12,8 +12,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
diff --git a/spec/hosts/roles/comcam_archiver_spec.rb b/spec/hosts/roles/comcam_archiver_spec.rb
index 701940a7d6..8848523d06 100644
--- a/spec/hosts/roles/comcam_archiver_spec.rb
+++ b/spec/hosts/roles/comcam_archiver_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'archiver'
 
           it { is_expected.to contain_file('/data/repo/LSSTComCam') }
diff --git a/spec/hosts/roles/comcam_fp_spec.rb b/spec/hosts/roles/comcam_fp_spec.rb
index e42ce6e36f..48e65c5e7c 100644
--- a/spec/hosts/roles/comcam_fp_spec.rb
+++ b/spec/hosts/roles/comcam_fp_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
               cluster: 'comcam-ccs',
             }
           end
@@ -20,8 +20,8 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('x2go packages', os_facts:)
           include_examples 'lhn sysctls'
           it { is_expected.not_to contain_class('dhcp') }
           it { is_expected.to contain_class('dhcp::disable') }
diff --git a/spec/hosts/roles/daq_mgt_spec.rb b/spec/hosts/roles/daq_mgt_spec.rb
index 7cd7ffd15a..e7b3935d7b 100644
--- a/spec/hosts/roles/daq_mgt_spec.rb
+++ b/spec/hosts/roles/daq_mgt_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 shared_examples 'generic daq manager' do |os_facts:, site:|
-  include_examples 'common', os_facts: os_facts, site: site, chrony: false
+  include_examples 'common', os_facts:, site:, chrony: false
   include_examples 'lsst-daq sysctls'
-  include_examples 'nfsv2 enabled', os_facts: os_facts
+  include_examples('nfsv2 enabled', os_facts:)
   include_examples 'daq common'
 
   it { is_expected.to contain_class('hosts') }
@@ -54,15 +54,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'generic daq manager', os_facts: os_facts, site: site
+          include_examples 'generic daq manager', os_facts:, site:
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/dco_spec.rb b/spec/hosts/roles/dco_spec.rb
index 84bb7be720..6089aabdfc 100644
--- a/spec/hosts/roles/dco_spec.rb
+++ b/spec/hosts/roles/dco_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'docker'
           include_examples 'dco'
 
diff --git a/spec/hosts/roles/dimm_spec.rb b/spec/hosts/roles/dimm_spec.rb
index f6662c1bbd..04cc60295e 100644
--- a/spec/hosts/roles/dimm_spec.rb
+++ b/spec/hosts/roles/dimm_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           it { is_expected.to contain_class('profile::core::yum::lsst_ts_private') }
           it { is_expected.to contain_package('ts_dimm_app-2.0-1.el8.x86_64') }
           it { is_expected.to contain_package('telnet') }
diff --git a/spec/hosts/roles/dm_bastion_spec.rb b/spec/hosts/roles/dm_bastion_spec.rb
index 8a98e5e67d..9699bdd088 100644
--- a/spec/hosts/roles/dm_bastion_spec.rb
+++ b/spec/hosts/roles/dm_bastion_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           it { is_expected.to have_nfs__client__mount_resource_count(6) }
 
           it do
diff --git a/spec/hosts/roles/dnscache_spec.rb b/spec/hosts/roles/dnscache_spec.rb
index 1642bd4def..f01881d69d 100644
--- a/spec/hosts/roles/dnscache_spec.rb
+++ b/spec/hosts/roles/dnscache_spec.rb
@@ -13,15 +13,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
 
           it do
             is_expected.to contain_class('dns').with(
diff --git a/spec/hosts/roles/docker_compose_spec.rb b/spec/hosts/roles/docker_compose_spec.rb
index 782182d5a8..467c712eb0 100644
--- a/spec/hosts/roles/docker_compose_spec.rb
+++ b/spec/hosts/roles/docker_compose_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'docker'
 
           it { is_expected.to contain_package('docker-compose-plugin') }
diff --git a/spec/hosts/roles/dtn_spec.rb b/spec/hosts/roles/dtn_spec.rb
index 132d93141f..86a9acff71 100644
--- a/spec/hosts/roles/dtn_spec.rb
+++ b/spec/hosts/roles/dtn_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           it { is_expected.to contain_class('profile::core::common') }
           it { is_expected.to contain_class('profile::core::dtn') }
 
diff --git a/spec/hosts/roles/ess_spec.rb b/spec/hosts/roles/ess_spec.rb
index 1346dbb622..f0ff1c7f50 100644
--- a/spec/hosts/roles/ess_spec.rb
+++ b/spec/hosts/roles/ess_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) do
@@ -29,7 +29,7 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'ftdi'
           include_examples 'rubinhat'
           include_examples 'dco'
diff --git a/spec/hosts/roles/fiberspec_spec.rb b/spec/hosts/roles/fiberspec_spec.rb
index e0d537bd27..0df7014985 100644
--- a/spec/hosts/roles/fiberspec_spec.rb
+++ b/spec/hosts/roles/fiberspec_spec.rb
@@ -13,15 +13,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'dco'
           include_examples 'fiberspec'
         end # host
diff --git a/spec/hosts/roles/foreman_spec.rb b/spec/hosts/roles/foreman_spec.rb
index 6dc1f2fc31..85f2b6bb9a 100644
--- a/spec/hosts/roles/foreman_spec.rb
+++ b/spec/hosts/roles/foreman_spec.rb
@@ -11,8 +11,8 @@
     context "on #{os}" do
       let(:node_params) do
         {
-          role: role,
-          site: site,
+          role:,
+          site:,
         }
       end
       let(:smee_url) { 'https://smee.io/lpxrggGObEn5YTA' }
@@ -44,7 +44,7 @@
 
         it { is_expected.to compile.with_all_deps }
 
-        include_examples 'common', os_facts: os_facts, site: site
+        include_examples('common', os_facts:, site:)
         include_examples 'generic foreman'
       end # host
 
@@ -74,7 +74,7 @@
 
         it { is_expected.to compile.with_all_deps }
 
-        include_examples 'common', os_facts: os_facts, site: site
+        include_examples('common', os_facts:, site:)
         include_examples 'generic foreman'
       end # host
 
@@ -105,7 +105,7 @@
 
         it { is_expected.to compile.with_all_deps }
 
-        include_examples 'common', os_facts: os_facts, site: site
+        include_examples('common', os_facts:, site:)
         include_examples 'generic foreman'
       end # host
 
@@ -135,7 +135,7 @@
 
         it { is_expected.to compile.with_all_deps }
 
-        include_examples 'common', os_facts: os_facts, site: site
+        include_examples('common', os_facts:, site:)
         include_examples 'generic foreman'
       end # host
     end
diff --git a/spec/hosts/roles/generic_spec.rb b/spec/hosts/roles/generic_spec.rb
index f24eaeb184..7b780bbd54 100644
--- a/spec/hosts/roles/generic_spec.rb
+++ b/spec/hosts/roles/generic_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples 'common', os_facts:, site:
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/hexrot_spec.rb b/spec/hosts/roles/hexrot_spec.rb
index 6c0e62e8a7..b62caa07a3 100644
--- a/spec/hosts/roles/hexrot_spec.rb
+++ b/spec/hosts/roles/hexrot_spec.rb
@@ -13,8 +13,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
@@ -22,8 +22,8 @@
           it { is_expected.to compile.with_all_deps }
 
           include_examples 'debugutils'
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('x2go packages', os_facts:)
           include_examples 'ni_packages'
           include_examples 'nexusctio'
           it { is_expected.to contain_class('mate') }
diff --git a/spec/hosts/roles/htcondor_spec.rb b/spec/hosts/roles/htcondor_spec.rb
index 6e130eb855..79131828be 100644
--- a/spec/hosts/roles/htcondor_spec.rb
+++ b/spec/hosts/roles/htcondor_spec.rb
@@ -15,8 +15,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
diff --git a/spec/hosts/roles/hvac_spec.rb b/spec/hosts/roles/hvac_spec.rb
index 51b6399df5..06f3200569 100644
--- a/spec/hosts/roles/hvac_spec.rb
+++ b/spec/hosts/roles/hvac_spec.rb
@@ -11,16 +11,16 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('x2go packages', os_facts:)
           it { is_expected.to contain_class('mate') }
         end # host
       end # lsst_sites
diff --git a/spec/hosts/roles/hypervisor_spec.rb b/spec/hosts/roles/hypervisor_spec.rb
index 7cef5b8bbb..77fdc40e9a 100644
--- a/spec/hosts/roles/hypervisor_spec.rb
+++ b/spec/hosts/roles/hypervisor_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
 
           %w[
             libguestfs
diff --git a/spec/hosts/roles/ipareplica_spec.rb b/spec/hosts/roles/ipareplica_spec.rb
index 35b55c4c1b..42f735e971 100644
--- a/spec/hosts/roles/ipareplica_spec.rb
+++ b/spec/hosts/roles/ipareplica_spec.rb
@@ -11,15 +11,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site, no_auth: true
+          include_examples 'common', os_facts:, site:, no_auth: true
 
           it do
             is_expected.to contain_class('tailscale').with_up_options(
@@ -46,7 +46,7 @@
           }.each do |host, ip|
             it do
               is_expected.to contain_host(host).with(
-                ip: ip
+                ip:
               )
             end
           end
diff --git a/spec/hosts/roles/it_ansible_spec.rb b/spec/hosts/roles/it_ansible_spec.rb
index 50cd7b35fc..cb5f3760c5 100644
--- a/spec/hosts/roles/it_ansible_spec.rb
+++ b/spec/hosts/roles/it_ansible_spec.rb
@@ -17,15 +17,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples 'common', os_facts:, site:
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/laserrpi_spec.rb b/spec/hosts/roles/laserrpi_spec.rb
index 0d04a36ded..2b36b62232 100644
--- a/spec/hosts/roles/laserrpi_spec.rb
+++ b/spec/hosts/roles/laserrpi_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) do
@@ -29,9 +29,9 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'docker'
-          include_examples 'gpio', os_facts: os_facts
+          include_examples('gpio', os_facts:)
           include_examples 'pigpio'
           include_examples 'ftdi'
           include_examples 'dco'
diff --git a/spec/hosts/roles/logictimer_spec.rb b/spec/hosts/roles/logictimer_spec.rb
index 9f54e8cc7a..d377893daa 100644
--- a/spec/hosts/roles/logictimer_spec.rb
+++ b/spec/hosts/roles/logictimer_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) do
@@ -29,9 +29,9 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'docker'
-          include_examples 'gpio', os_facts: os_facts
+          include_examples('gpio', os_facts:)
           include_examples 'gpshat'
           include_examples 'pigpio'
         end # host
diff --git a/spec/hosts/roles/m1m3_spec.rb b/spec/hosts/roles/m1m3_spec.rb
index 4f4bf3c272..d8bc65246e 100644
--- a/spec/hosts/roles/m1m3_spec.rb
+++ b/spec/hosts/roles/m1m3_spec.rb
@@ -11,16 +11,16 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('x2go packages', os_facts:)
           it { is_expected.to contain_class('mate') }
 
           %w[
diff --git a/spec/hosts/roles/m2_spec.rb b/spec/hosts/roles/m2_spec.rb
index 1caef60270..34ac197009 100644
--- a/spec/hosts/roles/m2_spec.rb
+++ b/spec/hosts/roles/m2_spec.rb
@@ -11,16 +11,16 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('x2go packages', os_facts:)
           it { is_expected.to contain_class('mate') }
           it { is_expected.to contain_class('profile::core::common') }
           it { is_expected.to contain_class('profile::core::debugutils') }
diff --git a/spec/hosts/roles/nfsserver_spec.rb b/spec/hosts/roles/nfsserver_spec.rb
index d824f32a5e..a26e05ccfc 100644
--- a/spec/hosts/roles/nfsserver_spec.rb
+++ b/spec/hosts/roles/nfsserver_spec.rb
@@ -12,15 +12,15 @@
         let(:site) { site }
         let(:node_params) do
           {
-            role: role,
-            site: site,
+            role:,
+            site:,
           }
         end
         let(:facts) { lsst_override_facts(os_facts) }
 
         it { is_expected.to compile.with_all_deps }
 
-        include_examples 'common', os_facts: os_facts, site: site
+        include_examples('common', os_facts:, site:)
 
         it do
           is_expected.to contain_class('nfs').with(
diff --git a/spec/hosts/roles/perfsonar_spec.rb b/spec/hosts/roles/perfsonar_spec.rb
index f25aaf500a..ea73545d9d 100644
--- a/spec/hosts/roles/perfsonar_spec.rb
+++ b/spec/hosts/roles/perfsonar_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
@@ -22,11 +22,11 @@
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
-          include_examples 'generic perfsonar', os_facts: os_facts
+          include_examples('common', os_facts:, site:)
+          include_examples('generic perfsonar', os_facts:)
           include_examples 'ipset'
-          include_examples 'firewall default', os_facts: os_facts
-          include_examples 'firewall node_exporter scraping', site: site
+          include_examples('firewall default', os_facts:)
+          include_examples('firewall node_exporter scraping', site:)
 
           it do
             is_expected.to contain_yum__versionlock('perfsonar-toolkit').with(
diff --git a/spec/hosts/roles/puppetdb_spec.rb b/spec/hosts/roles/puppetdb_spec.rb
index d809a37b90..a27923c810 100644
--- a/spec/hosts/roles/puppetdb_spec.rb
+++ b/spec/hosts/roles/puppetdb_spec.rb
@@ -120,21 +120,21 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'docker'
           it { is_expected.to contain_cron__job('docker_prune') }
 
           include_examples 'ipset'
-          include_examples 'firewall default', os_facts: os_facts
-          include_examples 'firewall node_exporter scraping', site: site
+          include_examples('firewall default', os_facts:)
+          include_examples('firewall node_exporter scraping', site:)
           include_examples 'puppetdb'
           include_examples 'puppetboard'
 
diff --git a/spec/hosts/roles/rke2agent_spec.rb b/spec/hosts/roles/rke2agent_spec.rb
index 0c63414e0b..5052537157 100644
--- a/spec/hosts/roles/rke2agent_spec.rb
+++ b/spec/hosts/roles/rke2agent_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 shared_examples 'generic rke2agent' do |os_facts:, site:|
-  include_examples 'common', os_facts: os_facts, site: site, node_exporter: false
+  include_examples 'common', os_facts:, site:, node_exporter: false
   include_examples 'debugutils'
   include_examples 'k8snode profile'
   include_examples 'restic common'
@@ -69,15 +69,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'generic rke2agent', os_facts: os_facts, site: site
+          include_examples 'generic rke2agent', os_facts:, site:
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/rke2server_spec.rb b/spec/hosts/roles/rke2server_spec.rb
index 4a37e05edc..40b4ba13e0 100644
--- a/spec/hosts/roles/rke2server_spec.rb
+++ b/spec/hosts/roles/rke2server_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 shared_examples 'generic rke2server' do |os_facts:, site:|
-  include_examples 'common', os_facts: os_facts, site: site, node_exporter: false
+  include_examples 'common', os_facts:, site:, node_exporter: false
   include_examples 'debugutils'
   include_examples 'k8snode profile'
   include_examples 'restic common'
@@ -83,15 +83,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'generic rke2server', os_facts: os_facts, site: site
+          include_examples 'generic rke2server', os_facts:, site:
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/rke_spec.rb b/spec/hosts/roles/rke_spec.rb
index a9a14107b3..f5b2777b3e 100644
--- a/spec/hosts/roles/rke_spec.rb
+++ b/spec/hosts/roles/rke_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 shared_examples 'generic rke' do |os_facts:, site:|
-  include_examples 'common', os_facts: os_facts, site: site, node_exporter: false
+  include_examples 'common', os_facts:, site:, node_exporter: false
   include_examples 'debugutils'
   include_examples 'docker'
   include_examples 'rke profile'
@@ -68,15 +68,15 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'generic rke', os_facts: os_facts, site: site
+          include_examples 'generic rke', os_facts:, site:
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/sal_dx_spec.rb b/spec/hosts/roles/sal_dx_spec.rb
index 19087d2a6d..326d193d22 100644
--- a/spec/hosts/roles/sal_dx_spec.rb
+++ b/spec/hosts/roles/sal_dx_spec.rb
@@ -11,17 +11,17 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'debugutils'
-          include_examples 'x2go packages', os_facts: os_facts
+          include_examples('x2go packages', os_facts:)
           it { is_expected.to contain_class('mate') }
         end # host
       end # lsst_sites
diff --git a/spec/hosts/roles/tang_spec.rb b/spec/hosts/roles/tang_spec.rb
index 009a2ee30b..042ec26be9 100644
--- a/spec/hosts/roles/tang_spec.rb
+++ b/spec/hosts/roles/tang_spec.rb
@@ -13,18 +13,18 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
 
           it { is_expected.to compile.with_all_deps }
 
-          include_examples 'common', os_facts: os_facts, site: site
+          include_examples('common', os_facts:, site:)
           include_examples 'ipset'
-          include_examples 'firewall default', os_facts: os_facts
-          include_examples 'firewall node_exporter scraping', site: site
+          include_examples('firewall default', os_facts:)
+          include_examples('firewall node_exporter scraping', site:)
           include_examples 'restic common'
 
           it { is_expected.to contain_class('tang') }
diff --git a/spec/hosts/roles/ubuntu_spec.rb b/spec/hosts/roles/ubuntu_spec.rb
index ca45d382da..04e63a8988 100644
--- a/spec/hosts/roles/ubuntu_spec.rb
+++ b/spec/hosts/roles/ubuntu_spec.rb
@@ -20,8 +20,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
diff --git a/spec/hosts/roles/vms-data_spec.rb b/spec/hosts/roles/vms-data_spec.rb
index c8a70c6064..dda4808088 100644
--- a/spec/hosts/roles/vms-data_spec.rb
+++ b/spec/hosts/roles/vms-data_spec.rb
@@ -11,8 +11,8 @@
         describe "#{role}.#{site}.lsst.org", :sitepp do
           let(:node_params) do
             {
-              role: role,
-              site: site,
+              role:,
+              site:,
             }
           end
           let(:facts) { lsst_override_facts(os_facts) }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 770eff038b..8bea73316d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -182,17 +182,17 @@ def gen_net_facts
 end
 
 shared_examples 'common' do |os_facts:, site:, no_auth: false, chrony: true, node_exporter: true|
-  include_examples 'bash_completion', os_facts: os_facts
+  include_examples('bash_completion', os_facts:)
   include_examples 'convenience'
   include_examples 'telegraf'
-  include_examples 'rsyslog defaults', site: site
+  include_examples('rsyslog defaults', site:)
 
   unless no_auth
     # inspect config fragment instead of class params to ensure that %{uid} is not
     # being caught by hiera string interpolation
     include_examples 'krb5.conf content', %r{default_ccache_name = FILE:/tmp/krb5cc_%{uid}}
 
-    include_examples 'krb5.conf.d files', os_facts: os_facts
+    include_examples('krb5.conf.d files', os_facts:)
     include_examples 'sssd services'
 
     it { is_expected.to contain_class('ssh').that_requires('Class[ipa]') }
diff --git a/spec/support/spec/dhcp.rb b/spec/support/spec/dhcp.rb
index e353a63183..a811b4c990 100644
--- a/spec/support/spec/dhcp.rb
+++ b/spec/support/spec/dhcp.rb
@@ -4,8 +4,8 @@
   it do
     is_expected.to contain_class('dhcp').with(
       interfaces: dhcp_interfaces,
-      nameservers: nameservers,
-      ntpservers: ntpservers,
+      nameservers:,
+      ntpservers:,
       option_static_route: true
     )
   end