Don't use the brightbox ruby repo on Ubuntu 16.04

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 4874d15fbd8a5a894d1f4b417ff2d7fa2d63c362..e3787470a454b4cd13ade0f840d32fbc4c36bf9a 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -37,9 +37,15 @@ template "/etc/apt/sources.list" do
   notifies :run, "execute[apt-update]", :immediately
 end
 
   notifies :run, "execute[apt-update]", :immediately
 end
 

-apt_source "brightbox-ruby-ng" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
-  key "C3173AA6"
+if node[:lsb][:release].to_f >= 16.04
+  apt_source "brightbox-ruby-ng" do
+    action :delete
+  end
+else
+  apt_source "brightbox-ruby-ng" do
+    url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
+    key "C3173AA6"
+  end

 end
 
 apt_source "ubuntugis-stable" do
 end
 
 apt_source "ubuntugis-stable" do