Move gpu driver dependencies higher up

ComputeCanada · Feb 10, 2021 · 819c4e2 · 819c4e2
1 parent fba256d
commit 819c4e2
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/site/profile/manifests/gpu.pp b/site/profile/manifests/gpu.pp
@@ -15,20 +15,22 @@
   }
 }
 
-class profile::gpu::install {
+class profile::gpu::install::deps {
   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
   } else {
     require profile::gpu::install::vgpu
   }
 
-  ensure_packages(['kernel-devel'], {ensure => 'installed'})
-  ensure_packages(['dkms'], {
-    'require' => Yumrepo['epel']
-  })
-
   exec { 'dkms autoinstall':
     path    => ['/usr/bin', '/usr/sbin'],
     onlyif  => 'dkms status | grep -v -q \'nvidia.*installed\'',
@@ -81,6 +83,8 @@
 }
 
 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']}"
   $arch = $::facts['os']['architecture']
@@ -118,6 +122,8 @@
   Enum['rpm', 'bin', 'none'] $installer = 'none',
 )
 {
+  require profile::gpu::install::deps
+
   if $installer == 'rpm' {
     include profile::gpu::install::vgpu::rpm
   } elsif $installer == 'bin' {