Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 30ac1957721441a3ed1d09b1d581db0d8e4e7249..f69db4f3e553cd725acf2e97af0bced2d6dab2dc 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -81,7 +81,6 @@ end
 apt_repository "openstreetmap" do
   action repository_actions["openstreetmap"]
   uri "ppa:osmadmins/ppa"
-  only_if { node[:lsb][:release].to_f < 22.04 }
 end
 
 apt_repository "management-component-pack" do
@@ -116,9 +115,9 @@ apt_repository "elasticsearch5.x" do
   key "D27D666CD88E42B4"
 end
 
-apt_repository "elasticsearch6.x" do
-  action repository_actions["elasticsearch6.x"]
-  uri "https://artifacts.elastic.co/packages/6.x/apt"
+apt_repository "elasticsearch8.x" do
+  action repository_actions["elasticsearch8.x"]
+  uri "https://artifacts.elastic.co/packages/8.x/apt"
   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"