From 29016dedd6532f9f43550e75d114f628138c076a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 26 Sep 2022 13:12:35 +0100 Subject: [PATCH] Enable both the jammy and focal HP repos for Gen10 machines --- .../apt/recipes/management-component-pack.rb | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/cookbooks/apt/recipes/management-component-pack.rb b/cookbooks/apt/recipes/management-component-pack.rb index 50ec5b8d1..09b982d37 100644 --- a/cookbooks/apt/recipes/management-component-pack.rb +++ b/cookbooks/apt/recipes/management-component-pack.rb @@ -19,15 +19,29 @@ include_recipe "apt" -distribution_name = if node[:dmi][:system][:product_name].end_with?("Gen10") - "focal/current-gen10" - else - "bionic/current-gen9" - end - apt_repository "management-component-pack" do - uri "https://downloads.linux.hpe.com/SDR/repo/mcp" - distribution distribution_name - components ["non-free"] - key "C208ADDE26C2B797" + action :remove +end + +if node[:dmi][:system][:product_name].end_with?("Gen10") + apt_repository "mcp-jammy" do + uri "https://downloads.linux.hpe.com/SDR/repo/mcp" + distribution "jammy/current" + components ["non-free"] + key "C208ADDE26C2B797" + end + + apt_repository "mcp-focal-gen10" do + uri "https://downloads.linux.hpe.com/SDR/repo/mcp" + distribution "focal/current-gen10" + components ["non-free"] + key "C208ADDE26C2B797" + end +else + apt_repository "mcp-bionic-gen9" do + uri "https://downloads.linux.hpe.com/SDR/repo/mcp" + distribution "bionic/current-gen9" + components ["non-free"] + key "C208ADDE26C2B797" + end end -- 2.39.5