From e97fc7bacaca5417c68bb5728d148b07d792d72b Mon Sep 17 00:00:00 2001 From: Alexandre Marangone Date: Fri, 15 Mar 2013 12:13:01 -0700 Subject: [PATCH] Update apt configuration and recipes The configuration changes aims to be more in-line with ceph-deploy. Changing key and repository for gitbuilder. Signed-off-by: Alexandre Marangone --- attributes/apt.rb | 4 ++-- recipes/apt.rb | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/attributes/apt.rb b/attributes/apt.rb index 118e27d..3e8804e 100644 --- a/attributes/apt.rb +++ b/attributes/apt.rb @@ -1,3 +1,3 @@ -default['ceph']['branch'] = "release" # Can be testing or autobuild -# Major release version to install. Currently bobtail (most recent) or argonaut. +default['ceph']['branch'] = "stable" # Can be stable, testing or dev. +# Major release version to install or gitbuilder branch default['ceph']['version'] = "bobtail" diff --git a/recipes/apt.rb b/recipes/apt.rb index fa8e4e2..f666cb1 100644 --- a/recipes/apt.rb +++ b/recipes/apt.rb @@ -1,13 +1,13 @@ include_recipe "apt" case node['ceph']['branch'] -when "release" - apt_repository "ceph-release" do +when "stable" + apt_repository "ceph-stable" do repo_name "ceph" uri "http://www.ceph.com/debian-#{node['ceph']['version']}/" distribution node['lsb']['codename'] components ["main"] - key "https://raw.github.com/ceph/ceph/master/keys/release.asc" + key "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc" end when "testing" apt_repository "ceph-testing" do @@ -15,14 +15,14 @@ when "testing" uri "http://www.ceph.com/debian-testing/" distribution node['lsb']['codename'] components ["main"] - key "https://raw.github.com/ceph/ceph/master/keys/release.asc" + key "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc" end -when "autobuild" - apt_repository "ceph-autobuild" do +when "dev" + apt_repository "ceph-gitbuilder" do repo_name "ceph" - uri "http://gitbuilder.ceph.com/ceph-deb-#{node['lsb']['codename']}-x86_64-basic/ref/autobuild" + uri "http://gitbuilder.ceph.com/ceph-deb-#{node['lsb']['codename']}-x86_64-basic/ref/#{node['ceph']['version']}" distribution node['lsb']['codename'] components ["main"] - key "https://raw.github.com/ceph/ceph/master/keys/autobuild.asc" + key "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc" end end