openstack/puppet-ceph
Code Issues Proposed changes

Switch puppet-ceph to rspec-puppet-facts

Browse Source 
Change-Id: I17bbb499971499f96588cc5a98e1420b9abbdd42
This commit is contained in:
Mykyta Karpin
2016-11-14 16:55:46 +02:00
parent 9f0a882902
commit 6a12d71f43
9 changed files with 92 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/osd.pp
View File

@@ -57,6 +57,8 @@ define ceph::osd (
$fsid = $::ceph::profile::params::fsid,
) {
include ::ceph::params
$data = $name
if $cluster {

25
spec/classes/ceph_init_spec.rb
View File

@@ -142,23 +142,16 @@ describe 'ceph' do
end
end
describe 'Debian Family' do
let :facts do
{
:osfamily => 'Debian',
}
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_configures 'ceph'
it_behaves_like 'ceph'
end
end
describe 'RedHat Family' do
let :facts do
{
:osfamily => 'RedHat',
}
end
it_configures 'ceph'
end
end

28
spec/classes/ceph_mds_spec.rb
View File

@@ -54,24 +54,16 @@ describe 'ceph::mds' do
end
end
describe 'Debian Family' do
let :facts do
{
:osfamily => 'Debian',
}
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'ceph mds'
end
it_configures 'ceph mds'
end
describe 'RedHat Family' do
let :facts do
{
:osfamily => 'RedHat',
}
end
it_configures 'ceph mds'
end
end
end

39
spec/classes/ceph_mons_spec.rb
View File

@@ -46,37 +46,16 @@ describe 'ceph::mons' do
}
end
describe 'Ubuntu' do
let :facts do
{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
}
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'ceph mons'
end
it_configures 'ceph mons'
end
describe 'Debian' do
let :facts do
{
:osfamily => 'Debian',
:operatingsystem => 'Debian',
}
end
it_configures 'ceph mons'
end
describe 'RHEL7' do
let :facts do
{
:osfamily => 'RedHat',
:operatingsystemmajrelease => '7',
}
end
it_configures 'ceph mons'
end
end

38
spec/classes/ceph_osds_spec.rb
View File

@@ -58,38 +58,18 @@ describe 'ceph::osds' do
end
end
describe 'Ubuntu' do
let :facts do
{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
}
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_configures 'ceph osds'
it_behaves_like 'ceph osds'
end
end
describe 'Debian' do
let :facts do
{
:osfamily => 'Debian',
:operatingsystem => 'Debian',
}
end
it_configures 'ceph osds'
end
describe 'RedHat' do
let :facts do
{
:osfamily => 'RedHat',
:operatingsystem => 'RedHat',
}
end
it_configures 'ceph osds'
end
end
# Local Variables:

26
spec/defines/ceph_key_spec.rb
View File

@@ -57,26 +57,16 @@ describe 'ceph::key' do
end
end
describe 'Debian Family' do
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
let :facts do
{
:osfamily => 'Debian',
}
it_behaves_like 'ceph key'
end
it_configures 'ceph key'
end
describe 'RedHat Family' do
let :facts do
{
:osfamily => 'RedHat',
}
end
it_configures 'ceph key'
end
end

27
spec/defines/ceph_osd_spec.rb
View File

@@ -235,25 +235,16 @@ fi
end
end
context 'Debian Family' do
let :facts do
{
:osfamily => 'Debian',
}
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'ceph osd'
end
it_configures 'ceph osd'
end
context 'RedHat Family' do
let :facts do
{
:osfamily => 'RedHat',
}
end
it_configures 'ceph osd'
end
end

26
spec/defines/ceph_pool_spec.rb
View File

@@ -76,26 +76,16 @@ describe 'ceph::pool' do
end
end
describe 'Debian Family' do
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
let :facts do
{
:osfamily => 'Debian',
}
it_behaves_like 'ceph pool'
end
it_configures 'ceph pool'
end
describe 'RedHat Family' do
let :facts do
{
:osfamily => 'RedHat',
}
end
it_configures 'ceph pool'
end
end

72
spec/defines/ceph_rgw_civetweb_spec.rb
View File

@@ -34,7 +34,7 @@ describe 'ceph::rgw' do
:frontend_type => 'civetweb',
}
end
it { is_expected.to contain_ceph_config('client.radosgw.civetweb/user').with_value("#{default_params[:user]}") }
it { is_expected.to contain_ceph_config('client.radosgw.civetweb/user').with_value("#{platform_params[:user]}") }
it { is_expected.to contain_ceph_config('client.radosgw.civetweb/host').with_value('myhost') }
it { is_expected.to contain_ceph_config('client.radosgw.civetweb/keyring').with_value('/etc/ceph/ceph.client.radosgw.civetweb.keyring') }
it { is_expected.to contain_ceph_config('client.radosgw.civetweb/log_file').with_value('/var/log/ceph/radosgw.log') }
@@ -61,51 +61,35 @@ describe 'ceph::rgw' do
end
describe 'Debian Family' do
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'myhost.domain',
:hostname => 'myhost',
}))
end
let :facts do
{
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'myhost.domain',
:hostname => 'myhost',
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '14.04',
}
let :platform_params do
case facts[:osfamily]
when 'Debian'
{
:pkg_radosgw => 'radosgw',
:user => 'www-data',
}
when 'RedHat'
{
:pkg_radosgw => 'ceph-radosgw',
:user => 'apache',
}
end
end
it_behaves_like 'ceph rgw civetweb'
end
let :default_params do
{
:pkg_radosgw => 'radosgw',
:user => 'www-data',
}
end
it_configures 'ceph rgw civetweb'
end
describe 'RedHat Family' do
let :facts do
{
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'myhost.domain',
:hostname => 'myhost',
:osfamily => 'RedHat',
:operatingsystem => 'RedHat',
:operatingsystemrelease => '7.2',
:operatingsystemmajrelease => '7',
}
end
let :default_params do
{
:pkg_radosgw => 'ceph-radosgw',
:user => 'apache',
}
end
it_configures 'ceph rgw civetweb'
end
end