Merge remote-tracking branch 'github/pull/704'

[chef.git] / cookbooks / apt / recipes / management-component-pack.rb

diff --git a/cookbooks/apt/recipes/management-component-pack.rb b/cookbooks/apt/recipes/management-component-pack.rb
index 34aad4d5e3cf542f31d852edf1e56dba2a596d78..92d81f989cdfd6275db953666a3bf84b40762c33 100644 (file)
--- a/cookbooks/apt/recipes/management-component-pack.rb
+++ b/cookbooks/apt/recipes/management-component-pack.rb
@@ -24,17 +24,17 @@ apt_repository "management-component-pack" do
 end
 
 if platform?("debian")
-  if node[:dmi][:system][:product_name].end_with?("Gen10")
-    apt_repository "mcp-gen10" do
-      uri "https://downloads.linux.hpe.com/SDR/repo/mcp"
-      distribution "#{node[:lsb][:codename]}/current-gen10"
-      components ["non-free"]
-      key "C208ADDE26C2B797"
-    end
-  else
-    apt_repository "mcp" do
+  apt_repository "mcp" do
+    uri "https://downloads.linux.hpe.com/SDR/repo/mcp"
+    distribution "#{node[:lsb][:codename]}/current"
+    components ["non-free"]
+    key "C208ADDE26C2B797"
+  end
+
+  if node[:dmi][:system][:product_name].end_with?("Gen9")
+    apt_repository "mcp-gen9" do
       uri "https://downloads.linux.hpe.com/SDR/repo/mcp"
-      distribution "#{node[:lsb][:codename]}/current"
+      distribution "stretch/current-gen9"
       components ["non-free"]
       key "C208ADDE26C2B797"
     end