Install gnupg for apt signature verification

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 15cf58f9af929304423fc1dbc7b759c460857d3e..3a660527da1a70c3f3ecf55ef4283bbcfc815180 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -20,13 +20,10 @@
 package %w[
   apt
   apt-transport-https
+  gnupg
   update-notifier-common
 ]
 
-if node[:lsb][:release].to_f < 18.04
-  package "gnupg-curl"
-end
-
 file "/etc/motd.tail" do
   action :delete
 end
@@ -87,11 +84,7 @@ end
 apt_repository "management-component-pack" do
   action repository_actions["management-component-pack"]
   uri "https://downloads.linux.hpe.com/SDR/repo/mcp"
-  if node[:lsb][:release].to_f >= 16.04
-    distribution "xenial/current"
-  else
-    distribution "#{node[:lsb][:codename]}/current"
-  end
+  distribution "#{node[:lsb][:codename]}/current-gen9"
   components ["non-free"]
   key "C208ADDE26C2B797"
 end
@@ -106,6 +99,7 @@ end
 
 apt_repository "nginx" do
   action repository_actions["nginx"]
+  arch "amd64"
   uri "https://nginx.org/packages/ubuntu"
   components ["nginx"]
   key "ABF5BD827BD9BF62"