Add explicit requirement on dkms and kernel-devel

ComputeCanada · Feb 12, 2021 · 0eb1d68 · 0eb1d68
1 parent 58c13d3
commit 0eb1d68
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/site/profile/manifests/gpu.pp b/site/profile/manifests/gpu.pp
@@ -15,15 +15,12 @@
   }
 }
 
-class profile::gpu::install::deps {
+class profile::gpu::install {
   ensure_resource('file', '/etc/nvidia', {'ensure' => 'directory' })
   ensure_packages(['kernel-devel'], {ensure => 'installed'})
   ensure_packages(['dkms'], {
     'require' => Yumrepo['epel']
   })
-}
-
-class profile::gpu::install {
 
   if ! $facts['nvidia_grid_vgpu'] {
     require profile::gpu::install::passthrough
@@ -83,7 +80,6 @@
 }
 
 class profile::gpu::install::passthrough(Array[String] $packages) {
-  require profile::gpu::install::deps
 
   $cuda_ver = $::facts['nvidia_cuda_version']
   $os = "rhel${::facts['os']['release']['major']}"
@@ -122,8 +118,6 @@
   Enum['rpm', 'bin', 'none'] $installer = 'none',
 )
 {
-  require profile::gpu::install::deps
-
   if $installer == 'rpm' {
     include profile::gpu::install::vgpu::rpm
   } elsif $installer == 'bin' {
@@ -178,6 +172,10 @@
       '/usr/bin/nvidia-modprobe',
     ],
     timeout => 300,
+    require => [
+      Package['kernel-devel'],
+      Package['dkms'],
+    ]
   }
 
   file { '/etc/nvidia/gridd.conf':