From 1ba153e476544789cf7d4596a102427371c22816 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 29 Jun 2022 19:01:31 +0100 Subject: [PATCH] Use 20.04 chef client on 22.04 for now --- cookbooks/chef/recipes/default.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb index 61ac42415..bd22671a7 100644 --- a/cookbooks/chef/recipes/default.rb +++ b/cookbooks/chef/recipes/default.rb @@ -36,8 +36,14 @@ Dir.glob("#{cache_dir}/chef_*.deb").each do |deb| end end +ubuntu_release = if node[:lsb][:release].to_f < 22.04 + node[:lsb][:release] + else + "20.04" + end + remote_file "#{cache_dir}/#{chef_package}" do - source "https://packages.chef.io/files/stable/chef/#{chef_version}/ubuntu/#{node[:lsb][:release]}/#{chef_package}" + source "https://packages.chef.io/files/stable/chef/#{chef_version}/ubuntu/#{ubuntu_release}/#{chef_package}" owner "root" group "root" mode "644" -- 2.45.1