Update longma interface names

[chef.git] / cookbooks / chef / recipes / default.rb

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 99f665541521c5ff1a4926d03e0308909b61d524..a27b99cbdcc4fcb5c25491f4aaf5f5b1b9208a4f 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -33,6 +33,18 @@ chef_arch = if arm?
               "amd64"
             end
 
+os_release = if platform?("debian") && node[:lsb][:release].to_f > 11
+               11
+             else
+               node[:lsb][:release]
+             end
+
+# Chef is currently not available for Debian 11 on arm64.
+if chef_platform == "debian" && os_release == 11 && chef_arch == "arm64"
+  chef_platform = "ubuntu"
+  os_release = "22.04"
+end
+
 chef_package = "chef_#{chef_version}-1_#{chef_arch}.deb"
 
 directory "/var/cache/chef" do
@@ -49,12 +61,6 @@ Dir.glob("#{cache_dir}/chef_*.deb").each do |deb|
   end
 end
 
-os_release = if platform?("debian") && node[:lsb][:release].to_f > 11
-               11
-             else
-               node[:lsb][:release]
-             end
-
 remote_file "#{cache_dir}/#{chef_package}" do
   source "https://packages.chef.io/files/stable/chef/#{chef_version}/#{chef_platform}/#{os_release}/#{chef_package}"
   owner "root"
@@ -102,11 +108,6 @@ template "/etc/logrotate.d/chef" do
   mode "644"
 end
 
-# Remove the ancient verisign certificate workaround
-file "/etc/chef/trusted_certs/verisign.pem" do
-  action :delete
-end
-
 directory node[:ohai][:plugin_dir] do
   owner "root"
   group "root"
@@ -136,8 +137,3 @@ end
 service "chef-client.timer" do
   action [:enable, :start]
 end
-
-service "chef-client.service" do
-  action :disable
-  subscribes :stop, "service[chef-client.timer]"
-end