use "apt" cookbook to manage apt file.

Add "testing" as possible branch

diff --git a/attributes/apt.rb b/attributes/apt.rb
new file mode 100644 (file)
index 0000000..f28dba9
--- /dev/null
+++ b/attributes/apt.rb
@@ -0,0 +1 @@
+default['ceph']['branch'] = "release" # Can be testing or autobuild

diff --git a/metadata.rb b/metadata.rb
index 609502c02ee01b89bc7ed069a6820ff899289404..a9c6bd470c1cb7983c089adb0cbb03a5e9dab276 100644 (file)
--- a/metadata.rb
+++ b/metadata.rb
@@ -6,3 +6,4 @@ description                     "Installs/Configures the Ceph distributed filesystem"
 long_description       IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version                                "0.0.10"
 depends                                "apache2"
+depends                        "apt"

diff --git a/recipes/apt.rb b/recipes/apt.rb
index 1c91226021ea03347d5d4a0af7efd064c8bb3c64..1aa272f2140ee780badb36720242016732348aeb 100644 (file)
--- a/recipes/apt.rb
+++ b/recipes/apt.rb
@@ -1,21 +1,28 @@
-release_or_autobuild = node["ceph_branch"].nil? ? "release" : "autobuild"
+include_recipe "apt"
 
-execute "add autobuild gpg key to apt" do
-  command <<-EOH
-wget -q -O- https://raw.github.com/ceph/ceph/master/keys/#{release_or_autobuild}.asc \
-| sudo apt-key add -
-  EOH
+case node['ceph']['branch']
+when "release"
+  apt_repository "ceph-release" do
+    repo_name "ceph"
+    uri "http://ceph.newdream.net/debian/"
+    distribution node['lsb']['codename']
+    components ["main"]
+    key "https://raw.github.com/ceph/ceph/master/keys/release.asc"
+  end
+when "testing"
+  apt_repository "ceph-testing" do
+    repo_name "ceph"
+    uri "http://ceph.newdream.net/debian-testing/"
+    distribution node['lsb']['codename']
+    components ["main"]
+    key "https://raw.github.com/ceph/ceph/master/keys/release.asc"
+  end
+when "autobuild"
+  apt_repository "ceph-autobuild" do
+    repo_name "ceph"
+    uri "http://gitbuilder.ceph.com/ceph-deb-#{node['lsb']['codename']}-x86_64-basic/ref/autobuild"
+    distribution node['lsb']['codename']
+    components ["main"]
+    key "https://raw.github.com/ceph/ceph/master/keys/autobuild.asc"
+  end
 end
-
-template '/etc/apt/sources.list.d/ceph.list' do
-  owner 'root'
-  group 'root'
-  mode '0644'
-  source 'apt-sources-list.release.erb'
-  variables(
-    :codename => node[:lsb][:codename],
-    :branch => node["ceph_branch"]
-  )
-end
-
-execute 'apt-get update'

diff --git a/templates/default/apt-sources-list.release.erb b/templates/default/apt-sources-list.release.erb
deleted file mode 100644 (file)
index 13dba6b..0000000
--- a/templates/default/apt-sources-list.release.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @branch.nil? %>
-deb http://ceph.newdream.net/debian/ <%= @codename %> main
-deb-src http://ceph.newdream.net/debian/ <%= @codename %> main
-<% else %>
-deb http://gitbuilder.ceph.com/ceph-deb-<%= @codename %>-x86_64-basic/ref/<%= @branch %>/ <%= @codename %> main
-deb-src http://gitbuilder.ceph.com/ceph-deb-<%= @codename %>-x86_64-basic/ref/<%= @branch %>/ <%= @codename %> main
-<% end %>