Don't define osmadmins PPA on 14.04

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index d9a4a63f5bf65dd1d95cdddf25eab319089a3940..dea088bb66a8b48263fe19788da8b96a9c534121 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -37,12 +37,6 @@ template "/etc/apt/sources.list" do
   notifies :run, "execute[apt-update]"
 end
 
   notifies :run, "execute[apt-update]"
 end
 

-apt_source "opscode" do
-  template "opscode.list.erb"
-  url "http://apt.opscode.com/"
-  key "83EF826A"
-end
-

 apt_source "brightbox" do
   url "http://apt.brightbox.net/"
   key "0090DAAD"
 apt_source "brightbox" do
   url "http://apt.brightbox.net/"
   key "0090DAAD"


@@ -78,14 +72,11 @@ apt_source "brianmercer-php" do
   key "8D0DC64F"
 end
 
   key "8D0DC64F"
 end
 

-apt_source "aw-drupal" do
-  url "http://ppa.launchpad.net/aw/drupal/ubuntu"
-  key "7D5AE8F6"
-end
-
-apt_source "openstreetmap" do
-  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-  key "0AC4F2CB"
+if node[:lsb][:release].to_f < 14.04
+  apt_source "openstreetmap" do
+    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+    key "0AC4F2CB"
+  end

 end
 
 apt_source "proliant-support-pack" do
 end
 
 apt_source "proliant-support-pack" do


@@ -101,6 +92,7 @@ apt_source "management-component-pack" do
 end
 
 apt_source "hwraid" do
 end
 
 apt_source "hwraid" do

+  template "hwraid.list.erb"

   url "http://hwraid.le-vert.net/ubuntu"
   key "23B3D3B4"
 end
   url "http://hwraid.le-vert.net/ubuntu"
   key "23B3D3B4"
 end