Commit 2e676077 authored by Keith Schincke's avatar Keith Schincke

The ceph extras location is no more.

From http://ceph.com/packages/ceph-extras/debian/
"The requested resource /packages/ceph-extras/debian/
is no longer available on this server and there is no forwarding
address. Please remove all references to this resource."

Change-Id: Ic37b3b047568418d70a49a72f5b77b5c42a330e7
parent 9b9de929
......@@ -8,3 +8,4 @@ Gemfile.lock
vendor
.vagrant/*
log
.bundled_gems/
......@@ -36,16 +36,12 @@
# [*release*] The name of the Ceph release to install
# Optional. Default to 'hammer'.
#
# [*extras*] Install Ceph Extra APT repo.
# Optional. Defaults to 'false'.
#
# [*fastcgi*] Install Ceph fastcgi apache module for Ceph
# Optional. Defaults to 'false'
#
class ceph::repo (
$ensure = present,
$release = 'hammer',
$extras = false,
$fastcgi = false,
) {
case $::osfamily {
......@@ -66,17 +62,6 @@ class ceph::repo (
tag => 'ceph',
}
if $extras {
apt::source { 'ceph-extras':
ensure => $ensure,
location => 'http://ceph.com/packages/ceph-extras/debian/',
release => $::lsbdistcodename,
require => Apt::Key['ceph'],
}
}
if $fastcgi {
apt::key { 'ceph-gitbuilder':
......@@ -160,22 +145,6 @@ class ceph::repo (
tag => 'ceph',
}
if $extras and $el == '6' {
yumrepo { 'ext-ceph-extras':
enabled => $enabled,
descr => 'External Ceph Extras',
name => 'ext-ceph-extras',
baseurl => 'http://ceph.com/packages/ceph-extras/rpm/rhel6/$basearch',
gpgcheck => '1',
gpgkey => 'https://git.ceph.com/release.asc',
mirrorlist => absent,
priority => '10', # prefer ceph repos over EPEL
tag => 'ceph',
}
}
if $fastcgi {
yumrepo { 'ext-ceph-fastcgi':
......@@ -184,7 +153,7 @@ class ceph::repo (
name => 'ext-ceph-fastcgi',
baseurl => "http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel${el}-x86_64-basic/ref/master",
gpgcheck => '1',
gpgkey => 'https://git.ceph.com/autobuild.asc',
gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
mirrorlist => absent,
priority => '20', # prefer ceph repos over EPEL
tag => 'ceph',
......
......@@ -100,28 +100,6 @@ describe 'ceph::repo' do
) }
end
describe "when wanting extras" do
let :params do
{
:extras => true
}
end
it { is_expected.to contain_apt__source('ceph').with(
:location => 'http://download.ceph.com/debian-hammer/',
:release => 'trusty',
:require => 'Apt::Key[ceph]'
) }
it { is_expected.to contain_apt__source('ceph-extras').with(
:ensure => 'present',
:location => 'http://ceph.com/packages/ceph-extras/debian/',
:release => 'trusty',
:require => 'Apt::Key[ceph]'
) }
end
describe "when wanting fast-cgi" do
let :params do
{
......@@ -153,7 +131,6 @@ describe 'ceph::repo' do
let :params do
{
:ensure => 'absent',
:extras => true,
:fastcgi => true
}
end
......@@ -165,13 +142,6 @@ describe 'ceph::repo' do
:require => 'Apt::Key[ceph]'
) }
it { is_expected.to contain_apt__source('ceph-extras').with(
:ensure => 'absent',
:location => 'http://ceph.com/packages/ceph-extras/debian/',
:release => 'trusty',
:require => 'Apt::Key[ceph]'
) }
it { is_expected.to contain_apt__source('ceph-fastcgi').with(
:ensure => 'absent',
:location => 'http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-trusty-x86_64-basic/ref/master',
......@@ -280,7 +250,6 @@ describe 'ceph::repo' do
let :params do
{
:ensure => 'absent',
:extras => true,
:fastcgi => true
}
end
......@@ -321,67 +290,19 @@ describe 'ceph::repo' do
:priority => '10'
) }
it { is_expected.to_not contain_yumrepo('ext-ceph-extras') }
it { is_expected.to contain_yumrepo('ext-ceph-fastcgi').with(
:enabled => '0',
:descr => 'FastCGI basearch packages for Ceph',
:name => 'ext-ceph-fastcgi',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master',
:gpgcheck => '1',
:gpgkey => 'https://git.ceph.com/autobuild.asc',
:gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
:mirrorlist => 'absent',
:priority => '20'
) }
end
describe "with ceph extras" do
let :params do
{
:extras => true
}
end
it { is_expected.not_to contain_file_line('exclude base') }
it { is_expected.to contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
) }
it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '1',
:descr => 'External Ceph hammer',
:name => 'ext-ceph-hammer',
:baseurl => 'http://download.ceph.com/rpm-hammer/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
:priority => '10'
) }
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-hammer-noarch',
:baseurl => 'http://download.ceph.com/rpm-hammer/el7/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
:priority => '10'
) }
it { is_expected.to_not contain_yumrepo('ext-ceph-extras') }
end
describe "with ceph fast-cgi" do
let :params do
{
......@@ -431,7 +352,7 @@ describe 'ceph::repo' do
:name => 'ext-ceph-fastcgi',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master',
:gpgcheck => '1',
:gpgkey => 'https://git.ceph.com/autobuild.asc',
:gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
:mirrorlist => 'absent',
:priority => '20'
) }
......@@ -541,7 +462,6 @@ describe 'ceph::repo' do
let :params do
{
:ensure => 'absent',
:extras => true,
:fastcgi => true
}
end
......@@ -582,67 +502,19 @@ describe 'ceph::repo' do
:priority => '10'
) }
it { is_expected.not_to contain_yumrepo('ext-ceph-extras') }
it { is_expected.to contain_yumrepo('ext-ceph-fastcgi').with(
:enabled => '0',
:descr => 'FastCGI basearch packages for Ceph',
:name => 'ext-ceph-fastcgi',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master',
:gpgcheck => '1',
:gpgkey => 'https://git.ceph.com/autobuild.asc',
:gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
:mirrorlist => 'absent',
:priority => '20'
) }
end
describe "with ceph extras" do
let :params do
{
:extras => true
}
end
it { is_expected.not_to contain_file_line('exclude base') }
it { is_expected.to contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
) }
it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '1',
:descr => 'External Ceph hammer',
:name => 'ext-ceph-hammer',
:baseurl => 'http://download.ceph.com/rpm-hammer/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
:priority => '10'
) }
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-hammer-noarch',
:baseurl => 'http://download.ceph.com/rpm-hammer/el7/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
:priority => '10'
) }
it { is_expected.not_to contain_yumrepo('ext-ceph-extras') }
end
describe "with ceph fast-cgi" do
let :params do
{
......@@ -692,7 +564,7 @@ describe 'ceph::repo' do
:name => 'ext-ceph-fastcgi',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master',
:gpgcheck => '1',
:gpgkey => 'https://git.ceph.com/autobuild.asc',
:gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
:mirrorlist => 'absent',
:priority => '20'
) }
......
......@@ -23,7 +23,6 @@ describe 'ceph::rgw::apache' do
let :pre_condition do
"include ceph::params
class { 'ceph::repo':
extras => true,
fastcgi => true,
}"
end
......
......@@ -40,7 +40,7 @@ describe 'ceph::rgw::keystone' do
"
include ceph::params
class { 'ceph': fsid => 'd5252e7d-75bc-4083-85ed-fe51fa83f62b' }
class { 'ceph::repo': extras => true, fastcgi => true, }
class { 'ceph::repo': fastcgi => true, }
include ceph
ceph::rgw { 'radosgw.gateway': }
ceph::rgw::apache { 'radosgw.gateway': }
......@@ -90,7 +90,7 @@ openssl x509 -in /tmp/signing -pubkey | certutil -A -d /var/lib/ceph/nss -n sign
"
include ceph::params
class { 'ceph': fsid => 'd5252e7d-75bc-4083-85ed-fe51fa83f62b' }
class { 'ceph::repo': extras => true, fastcgi => true, }
class { 'ceph::repo': fastcgi => true, }
ceph::rgw { 'radosgw.custom': }
ceph::rgw::apache { 'radosgw.custom': }
"
......@@ -158,7 +158,7 @@ openssl x509 -in /tmp/signing -pubkey | certutil -A -d /some/path/to/nss -n sign
"
include ceph::params
class { 'ceph': fsid => 'd5252e7d-75bc-4083-85ed-fe51fa83f62b' }
class { 'ceph::repo': extras => true, fastcgi => true, }
class { 'ceph::repo': fastcgi => true, }
include ceph
ceph::rgw { 'radosgw.gateway': }
ceph::rgw::apache { 'radosgw.gateway': }
......@@ -208,7 +208,7 @@ openssl x509 -in /tmp/signing -pubkey | certutil -A -d /var/lib/ceph/nss -n sign
"
include ceph::params
class { 'ceph': fsid => 'd5252e7d-75bc-4083-85ed-fe51fa83f62b' }
class { 'ceph::repo': extras => true, fastcgi => true, }
class { 'ceph::repo': fastcgi => true, }
ceph::rgw { 'radosgw.custom': }
ceph::rgw::apache { 'radosgw.custom': }
"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment