(profile::core::hardware) restrict nvme aspm related flags to EL7

lsst-it · Oct 21, 2022 · 5ceb230 · 5ceb230
1 parent d738618
commit 5ceb230
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/site/profile/manifests/core/hardware.pp b/site/profile/manifests/core/hardware.pp
@@ -13,13 +13,17 @@
     }
     /1114S-WN10RT/: {
       include ipmi
-      # aspm is suspected of causing problems with internal NVMes
-      include profile::core::kernel::pcie_aspm
-      # apst is suspected of causing problems with NVMes
-      include profile::core::kernel::nvme_apst
-      # attempt to improve NVMe hotplug support on el7
-      profile::util::kernel_param { 'pci=pcie_bus_perf':
-        reboot => false,
+
+      # EL7 only
+      if fact('os.family') == 'RedHat' and fact('os.release.major') == '7' {
+        # aspm is suspected of causing problems with internal NVMes
+        include profile::core::kernel::pcie_aspm
+        # apst is suspected of causing problems with NVMes
+        include profile::core::kernel::nvme_apst
+        # attempt to improve NVMe hotplug support on el7
+        profile::util::kernel_param { 'pci=pcie_bus_perf':
+          reboot => false,
+        }
       }
     }
   }

diff --git a/spec/classes/core/hardware_spec.rb b/spec/classes/core/hardware_spec.rb
@@ -52,13 +52,19 @@
 
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_class('ipmi') }
-        it { is_expected.not_to contain_class('profile::core::perccli') }
-        it { is_expected.to contain_class('profile::core::kernel::pcie_aspm') }
-        it { is_expected.to contain_class('profile::core::kernel::nvme_apst') }
 
-        it do
-          is_expected.to contain_profile__util__kernel_param('pci=pcie_bus_perf')
-            .with_reboot(false)
+        if (facts[:os]['family'] == 'RedHat') && (facts[:os]['release']['major'] == '7')
+          it { is_expected.to contain_class('profile::core::kernel::pcie_aspm') }
+          it { is_expected.to contain_class('profile::core::kernel::nvme_apst') }
+
+          it do
+            is_expected.to contain_profile__util__kernel_param('pci=pcie_bus_perf')
+              .with_reboot(false)
+          end
+        else
+          it { is_expected.not_to contain_class('profile::core::kernel::pcie_aspm') }
+          it { is_expected.not_to contain_class('profile::core::kernel::nvme_apst') }
+          it { is_expected.not_to contain_profile__util__kernel_param('pci=pcie_bus_perf') }
         end
       end  # 1114S-WN10RT