openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Bump default version to giant, test against giant and drop emperor"

This commit is contained in:
Jenkins 2015-02-03 00:22:31 +00:00 committed by Gerrit Code Review
parent e8f0b80688 e147439ecd
commit 62cd20af9b
15 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -89,7 +89,7 @@ for which integration tests are going to be run. The default is
```
BUNDLE_PATH=/tmp/vendor \
RELEASES='dumpling emperor firefly' \
RELEASES='dumpling firefly giant' \
bundle exec rake spec:system
```

3
examples/common.yaml
View File

@ -1,6 +1,6 @@
---
######## Ceph
ceph::profile::params::release: 'firefly'
ceph::profile::params::release: 'giant'
######## Ceph.conf
ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
@ -27,4 +27,3 @@ ceph::profile::params::osds:
journal: '/dev/sdb1'
'/dev/sdd':
journal: '/dev/sdb2'

2
manifests/repo.pp
View File

@ -24,7 +24,7 @@
#
class ceph::repo (
$ensure = present,
$release = 'firefly',
$release = 'giant',
$extras = false,
$fastcgi = false,
) {

70
spec/classes/ceph_repo_spec.rb
View File

@ -38,7 +38,7 @@ describe 'ceph::repo' do
) }
it { should contain_apt__source('ceph').with(
:location => 'http://ceph.com/debian-firefly/',
:location => 'http://ceph.com/debian-giant/',
:release => 'wheezy',
:require => 'Apt::Key[ceph]'
) }
@ -48,12 +48,12 @@ describe 'ceph::repo' do
describe "when overriding ceph release" do
let :params do
{
:release => 'dumpling'
:release => 'firefly'
}
end
it { should contain_apt__source('ceph').with(
:location => 'http://ceph.com/debian-dumpling/',
:location => 'http://ceph.com/debian-firefly/',
:release => 'wheezy',
:require => 'Apt::Key[ceph]'
) }
@ -79,7 +79,7 @@ describe 'ceph::repo' do
) }
it { should contain_apt__source('ceph').with(
:location => 'http://ceph.com/debian-firefly/',
:location => 'http://ceph.com/debian-giant/',
:release => 'precise',
:require => 'Apt::Key[ceph]'
) }
@ -89,12 +89,12 @@ describe 'ceph::repo' do
describe "when overriding ceph release" do
let :params do
{
:release => 'dumpling'
:release => 'firefly'
}
end
it { should contain_apt__source('ceph').with(
:location => 'http://ceph.com/debian-dumpling/',
:location => 'http://ceph.com/debian-firefly/',
:release => 'precise',
:require => 'Apt::Key[ceph]'
) }
@ -108,7 +108,7 @@ describe 'ceph::repo' do
end
it { should contain_apt__source('ceph').with(
:location => 'http://ceph.com/debian-firefly/',
:location => 'http://ceph.com/debian-giant/',
:release => 'precise',
:require => 'Apt::Key[ceph]'
) }
@ -135,7 +135,7 @@ describe 'ceph::repo' do
) }
it { should contain_apt__source('ceph').with(
:location => 'http://ceph.com/debian-firefly/',
:location => 'http://ceph.com/debian-giant/',
:release => 'precise',
:require => 'Apt::Key[ceph]'
) }
@ -160,7 +160,7 @@ describe 'ceph::repo' do
it { should contain_apt__source('ceph').with(
:ensure => 'absent',
:location => 'http://ceph.com/debian-firefly/',
:location => 'http://ceph.com/debian-giant/',
:release => 'precise',
:require => 'Apt::Key[ceph]'
) }
@ -206,9 +206,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
:descr => 'External Ceph firefly',
:name => 'ext-ceph-firefly',
:baseurl => 'http://ceph.com/rpm-firefly/el6/$basearch',
:descr => 'External Ceph giant',
:name => 'ext-ceph-giant',
:baseurl => 'http://ceph.com/rpm-giant/el6/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -218,8 +218,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-firefly-noarch',
:baseurl => 'http://ceph.com/rpm-firefly/el6/noarch',
:name => 'ext-ceph-giant-noarch',
:baseurl => 'http://ceph.com/rpm-giant/el6/noarch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -230,7 +230,7 @@ describe 'ceph::repo' do
describe "when overriding ceph release" do
let :params do
{
:release => 'dumpling'
:release => 'firefly'
}
end
@ -247,9 +247,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
:descr => 'External Ceph dumpling',
:name => 'ext-ceph-dumpling',
:baseurl => 'http://ceph.com/rpm-dumpling/el6/$basearch',
:descr => 'External Ceph firefly',
:name => 'ext-ceph-firefly',
:baseurl => 'http://ceph.com/rpm-firefly/el6/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -259,8 +259,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-dumpling-noarch',
:baseurl => 'http://ceph.com/rpm-dumpling/el6/noarch',
:name => 'ext-ceph-firefly-noarch',
:baseurl => 'http://ceph.com/rpm-firefly/el6/noarch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -290,9 +290,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '0',
:descr => 'External Ceph firefly',
:name => 'ext-ceph-firefly',
:baseurl => 'http://ceph.com/rpm-firefly/el6/$basearch',
:descr => 'External Ceph giant',
:name => 'ext-ceph-giant',
:baseurl => 'http://ceph.com/rpm-giant/el6/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -302,8 +302,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '0',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-firefly-noarch',
:baseurl => 'http://ceph.com/rpm-firefly/el6/noarch',
:name => 'ext-ceph-giant-noarch',
:baseurl => 'http://ceph.com/rpm-giant/el6/noarch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -354,9 +354,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
:descr => 'External Ceph firefly',
:name => 'ext-ceph-firefly',
:baseurl => 'http://ceph.com/rpm-firefly/el6/$basearch',
:descr => 'External Ceph giant',
:name => 'ext-ceph-giant',
:baseurl => 'http://ceph.com/rpm-giant/el6/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -366,8 +366,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-firefly-noarch',
:baseurl => 'http://ceph.com/rpm-firefly/el6/noarch',
:name => 'ext-ceph-giant-noarch',
:baseurl => 'http://ceph.com/rpm-giant/el6/noarch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -407,9 +407,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
:descr => 'External Ceph firefly',
:name => 'ext-ceph-firefly',
:baseurl => 'http://ceph.com/rpm-firefly/el6/$basearch',
:descr => 'External Ceph giant',
:name => 'ext-ceph-giant',
:baseurl => 'http://ceph.com/rpm-giant/el6/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',
@ -419,8 +419,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-firefly-noarch',
:baseurl => 'http://ceph.com/rpm-firefly/el6/noarch',
:name => 'ext-ceph-giant-noarch',
:baseurl => 'http://ceph.com/rpm-giant/el6/noarch',
:gpgcheck => '1',
:gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
:mirrorlist => 'absent',

2
spec/system/ceph_key_spec.rb
View File

@ -24,7 +24,7 @@ require 'spec_helper_system'
describe 'ceph::key' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'emperor', 'firefly' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
mon_key = 'AQCztJdSyNb0NBAASA2yPZPuwXeIQnDJ9O8gVw=='

2
spec/system/ceph_mon_spec.rb
View File

@ -21,7 +21,7 @@ require 'spec_helper_system'
describe 'ceph::mon' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'emperor', 'firefly' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
mon_host = '$::ipaddress_eth1'

2
spec/system/ceph_mons_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper_system'
describe 'ceph::mons' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'emperor', 'firefly' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'

2
spec/system/ceph_osd_spec.rb
View File

@ -22,7 +22,7 @@ require 'spec_helper_system'
describe 'ceph::osd' do
datas = ENV['DATAS'] ? ENV['DATAS'].split : [ '/dev/sdb', '/srv/data' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'emperor', 'firefly' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
admin_key = 'AQA0TVRTsP/aHxAAFBvntu1dSEJHxtJeFFrRsg=='

2
spec/system/ceph_osds_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper_system'
describe 'ceph::osds' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'emperor', 'firefly' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'

2
spec/system/ceph_pool_spec.rb
View File

@ -21,7 +21,7 @@ require 'spec_helper_system'
describe 'ceph::pool' do
releases = [ 'dumpling', 'emperor', 'firefly' ]
releases = [ 'dumpling', 'firefly', 'giant' ]
fsid = 'a4807c9a-e76f-4666-a297-6d6cbc922e3a'
releases.each do |release|

2
spec/system/ceph_profile_base_spec.rb
View File

@ -21,8 +21,8 @@ describe 'ceph::profile::base' do
release2version = {
'dumpling' => '0.67',
'emperor' => '0.72',
'firefly' => '0.80',
'giant' => '0.87',
}
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : release2version.keys

2
spec/system/ceph_profile_client_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper_system'
describe 'ceph::profile::client' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'emperor', 'firefly' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
packages = "[ 'python-ceph', 'ceph-common', 'librados2', 'librbd1', 'libcephfs1' ]"

2
spec/system/ceph_profile_mon_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper_system'
describe 'ceph::profile::mon' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'emperor', 'firefly' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
packages = "[ 'python-ceph', 'ceph-common', 'librados2', 'librbd1', 'libcephfs1' ]"

2
spec/system/ceph_profile_osd_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper_system'
describe 'ceph::profile::osd' do
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'emperor', 'firefly' ]
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : [ 'dumpling', 'firefly', 'giant' ]
machines = ENV['MACHINES'] ? ENV['MACHINES'].split : [ 'first', 'second' ]
# passing it directly as unqoted array is not supported everywhere
packages = "[ 'python-ceph', 'ceph-common', 'librados2', 'librbd1', 'libcephfs1' ]"

4
spec/system/ceph_repo_spec.rb
View File

@ -23,9 +23,9 @@ describe 'ceph::repo' do
release2version = {
'dumpling' => '0.67',
'emperor' => '0.72',
'firefly' => '0.80',
'(default)' => '0.80',
'giant' => '0.87',
'(default)' => '0.87',
}
releases = ENV['RELEASES'] ? ENV['RELEASES'].split : release2version.keys