From 872af6ca6ee49a6de0d68bf2db0dcdd9e132785b Mon Sep 17 00:00:00 2001 From: Gerhard Sulzberger Date: Wed, 23 Dec 2015 09:15:19 +0100 Subject: [PATCH 1/2] changed default paths from http://ceph.com to http://download.ceph.com for repository, release key and autobuild key download --- attributes/repo.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/attributes/repo.rb b/attributes/repo.rb index f215493..4bd3b37 100644 --- a/attributes/repo.rb +++ b/attributes/repo.rb @@ -2,41 +2,41 @@ # Major release version to install or gitbuilder branch default['ceph']['version'] = 'firefly' default['ceph']['el_add_epel'] = true -default['ceph']['repo_url'] = 'http://ceph.com' -default['ceph']['extras_repo_url'] = 'http://ceph.com/packages/ceph-extras' +default['ceph']['repo_url'] = 'http://download.ceph.com' +default['ceph']['extras_repo_url'] = 'http://ceph.com/packages/ceph-extras' #GONE is no longer available on this server default['ceph']['extras_repo'] = false case node['platform_family'] when 'debian' # Debian/Ubuntu default repositories default['ceph']['debian']['stable']['repository'] = "#{node['ceph']['repo_url']}/debian-#{node['ceph']['version']}/" - default['ceph']['debian']['stable']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['debian']['stable']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" default['ceph']['debian']['testing']['repository'] = "#{node['ceph']['repo_url']}/debian-testing/" - default['ceph']['debian']['testing']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['debian']['testing']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" default['ceph']['debian']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-deb-#{node['lsb']['codename']}-x86_64-basic/ref/#{node['ceph']['version']}" - default['ceph']['debian']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc' + default['ceph']['debian']['dev']['repository_key'] = "#{node['ceph']['extras_repo_url']}/keys/autobuild.asc" default['ceph']['debian']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/debian/" - default['ceph']['debian']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['debian']['extras']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" when 'rhel' # Redhat/CentOS default repositories default['ceph']['rhel']['stable']['repository'] = "#{node['ceph']['repo_url']}/rpm-#{node['ceph']['version']}/el6/x86_64/" - default['ceph']['rhel']['stable']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['rhel']['stable']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" default['ceph']['rhel']['testing']['repository'] = "#{node['ceph']['repo_url']}/rpm-testing/el6/x86_64/" - default['ceph']['rhel']['testing']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['rhel']['testing']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" default['ceph']['rhel']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-rpm-centos6-x86_64-basic/ref/#{node['ceph']['version']}/x86_64/" - default['ceph']['rhel']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc' + default['ceph']['rhel']['dev']['repository_key'] = "#{node['ceph']['repo_url']}/keys/autobuild.asc" default['ceph']['rhel']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/rpm/rhel6/x86_64/" - default['ceph']['rhel']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['rhel']['extras']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" when 'fedora' # Fedora default repositories default['ceph']['fedora']['stable']['repository'] = "#{node['ceph']['repo_url']}/rpm-#{node['ceph']['version']}/fc#{node['platform_version']}/x86_64/" - default['ceph']['fedora']['stable']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['fedora']['stable']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" default['ceph']['fedora']['testing']['repository'] = "#{node['ceph']['repo_url']}/rpm-testing/fc#{node['platform_version']}/x86_64/" - default['ceph']['fedora']['testing']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['fedora']['testing']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" default['ceph']['fedora']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-rpm-fc#{node['platform_version']}-x86_64-basic/ref/#{node['ceph']['version']}/RPMS/x86_64/" - default['ceph']['fedora']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc' + default['ceph']['fedora']['dev']['repository_key'] = "#{node['ceph']['repo_url']}/keys/autobuild.asc" default['ceph']['fedora']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/rpm/fedora#{node['platform_version']}/x86_64/" - default['ceph']['fedora']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' + default['ceph']['fedora']['extras']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc" when 'suse' # (Open)SuSE default repositories # Chef doesn't make a difference between suse and opensuse From 75670985894d116c35cd280ecbbdc70610d43a45 Mon Sep 17 00:00:00 2001 From: Gerhard Sulzberger Date: Wed, 23 Dec 2015 13:49:31 +0100 Subject: [PATCH 2/2] removed comment --- attributes/repo.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/repo.rb b/attributes/repo.rb index 4bd3b37..8e651b1 100644 --- a/attributes/repo.rb +++ b/attributes/repo.rb @@ -3,7 +3,7 @@ default['ceph']['version'] = 'firefly' default['ceph']['el_add_epel'] = true default['ceph']['repo_url'] = 'http://download.ceph.com' -default['ceph']['extras_repo_url'] = 'http://ceph.com/packages/ceph-extras' #GONE is no longer available on this server +default['ceph']['extras_repo_url'] = 'http://ceph.com/packages/ceph-extras' default['ceph']['extras_repo'] = false case node['platform_family']