Skip to content

Commit edc39c9

Browse files
committed
Revert Kernel pin on Ubuntu18
Revert commits: * 3757572 * a9168d4 * 3ede488 Signed-off-by: Luca Carrogu <[email protected]>
1 parent 270ef71 commit edc39c9

File tree

5 files changed

+1
-32
lines changed

5 files changed

+1
-32
lines changed

amis/packer_ubuntu1804.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"source_ami_filter": {
3333
"filters": {
3434
"virtualization-type": "hvm",
35-
"name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20200323",
35+
"name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*",
3636
"root-device-type": "ebs"
3737
},
3838
"owners": ["099720109477", "513442679011", "837727238323"],

attributes/default.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@
8080
default['cfncluster']['dcv']['installed'] = 'yes'
8181
default['cfncluster']['dcv']['version'] = '2020.0-8428'
8282
default['cfncluster']['dcv']['supported_os'] = %w[centos7 ubuntu18 amazon2]
83-
# Kernel packages
84-
default['cfncluster']['kernel']['package'] = nil
85-
default['cfncluster']['kernel']['headers'] = nil
8683

8784
case "#{node['platform']}#{node['platform_version'].to_i}"
8885
when 'centos7', 'amazon2'
@@ -242,8 +239,6 @@
242239
default['cfncluster']['base_packages'].delete('libatlas-dev')
243240
default['cfncluster']['base_packages'].push('libatlas-base-dev', 'libssl-dev', 'libglvnd-dev')
244241
default['cfncluster']['sge']['version'] = '8.1.9+dfsg-9build1'
245-
default['cfncluster']['kernel']['package'] = 'linux-image-4.15.0-1066-aws'
246-
default['cfncluster']['kernel']['headers'] = 'linux-headers-4.15.0-1066-aws'
247242
end
248243

249244
default['cfncluster']['lustre']['public_key'] = 'https://fsx-lustre-client-repo-public-keys.s3.amazonaws.com/fsx-ubuntu-public-key.asc'

files/ubuntu-16.04/linux-aws.pref

Lines changed: 0 additions & 1 deletion
This file was deleted.

files/ubuntu-18.04/linux-aws.pref

Lines changed: 0 additions & 11 deletions
This file was deleted.

recipes/_update_packages.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,7 @@
2323
command "yum -y update && package-cleanup -y --oldkernels --count=1"
2424
end
2525
when 'debian'
26-
# FIXME: pin Kernel version until Lustre client package version is not aligned with latest
27-
cookbook_file 'linux-aws.pref' do
28-
path '/etc/apt/preferences.d/linux-aws.pref'
29-
end
3026
apt_update
31-
if !node['cfncluster']['kernel']['package'].nil? && !node['cfncluster']['kernel']['package'].empty?
32-
package node['cfncluster']['kernel']['package'] do
33-
retries 3
34-
retry_delay 5
35-
end
36-
package node['cfncluster']['kernel']['headers'] do
37-
retries 3
38-
retry_delay 5
39-
end
40-
end
4127
execute 'apt-upgrade' do
4228
command "DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" --with-new-pkgs upgrade && apt-get autoremove -y"
4329
retries 3

0 commit comments

Comments
 (0)