Skip to content

Commit f7d654e

Browse files
lukeseawalkerenrico-usai
authored andcommitted
Fix installation of kernel devel packages on Ubuntu 14
Kernel devel packages are needed for NVIDIA driver installation. For older kernel version install linux-image-extra For newer kernel version install linux-generic Signed-off-by: Luca Carrogu <[email protected]>
1 parent b73be72 commit f7d654e

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

attributes/default.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@
125125
apache2 libboost-dev libdb-dev tcsh libssl-dev libncurses5-dev libpam0g-dev libxt-dev
126126
libmotif-dev libxmu-dev libxft-dev libhwloc-dev man-db lvm2 libmpich-dev libopenmpi-dev
127127
r-base libatlas-dev libblas-dev libfftw3-dev libffi-dev libssl-dev libxml2-dev mdadm]
128-
default['cfncluster']['kernel_devel_pkg']['name'] = "linux-generic"
128+
default['cfncluster']['kernel_generic_pkg'] = "linux-generic"
129+
default['cfncluster']['kernel_extra_pkg'] = "linux-image-extra-#{node['kernel']['release']}"
129130
default['cfncluster']['ganglia']['apache_user'] = 'www-data'
130131
default['cfncluster']['ganglia']['gmond_service'] = 'ganglia-monitor'
131132
default['cfncluster']['ganglia']['httpd_service'] = 'apache2'

recipes/_nvidia_install.rb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@
1616
# Only run if node['cfncluster']['nvidia']['enabled'] = 'yes'
1717
if node['cfncluster']['nvidia']['enabled'] == 'yes'
1818

19-
if node['cfncluster']['kernel_devel_pkg']['name'] != ""
20-
case node['platform_family']
21-
when 'rhel', 'amazon'
22-
yum_package node['cfncluster']['kernel_devel_pkg']['name']
23-
when 'debian'
24-
apt_package node['cfncluster']['kernel_devel_pkg']['name']
19+
case node['platform_family']
20+
when 'rhel', 'amazon'
21+
yum_package node['cfncluster']['kernel_devel_pkg']['name']
22+
when 'debian'
23+
# Needed for new kernel version
24+
apt_package node['cfncluster']['kernel_generic_pkg']
25+
# Needed for old kernel version
26+
apt_package node['cfncluster']['kernel_extra_pkg'] do
27+
ignore_failure true
2528
end
2629
end
2730

0 commit comments

Comments
 (0)