openstack/puppet-ceph
Code Issues Proposed changes

Fix spec tests missing lsbdistrelease

Browse Source 
With the release of puppetlabs-apt 2.3.0, the lsbdistrelease is now
being used and needs to be defined in the spec tests other wise
they fail under puppet 4.

Change-Id: I6d67d368c1e5908e485489f20bd6ae17a3350da1
This commit is contained in:
Alex Schultz
2016-09-23 09:53:00 -06:00
parent ede4eb080e
commit f0db26a116
9 changed files with 37 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spec/classes/ceph_profile_base_spec.rb
View File

@@ -36,45 +36,14 @@ describe 'ceph::profile::base' do
end
end
context 'on Debian' do
let :facts do
{
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'jessie'
}
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({})
end
it_behaves_like 'ceph profile base'
end
it_configures 'ceph profile base'
end
context 'on Ubuntu' do
let :facts do
{
:osfamily => 'Debian',
:lsbdistid => 'Ubuntu',
:lsbdistcodename => 'trusty'
}
end
it_configures 'ceph profile base'
end
context 'on RHEL7' do
let :facts do
{ :osfamily => 'RedHat',
:operatingsystemmajrelease => '7' }
end
it_configures 'ceph profile base'
end
end
# Local Variables:
# compile-command: "cd ../.. ;
# BUNDLE_PATH=/tmp/vendor bundle install ;
# BUNDLE_PATH=/tmp/vendor bundle exec rake spec
# "
# End:

47
spec/classes/ceph_profile_client_spec.rb
View File

@@ -89,48 +89,13 @@ describe 'ceph::profile::client' do
end
end
context 'on Debian' do
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({})
end
let :facts do
{
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'jessie',
:operatingsystem => 'Debian',
}
it_behaves_like 'ceph profile client'
end
it_configures 'ceph profile client'
end
context 'on Ubuntu' do
let :facts do
{
:osfamily => 'Debian',
:lsbdistid => 'Ubuntu',
:lsbdistcodename => 'trusty',
:operatingsystem => 'Ubuntu',
}
end
it_configures 'ceph profile client'
end
context 'on RHEL7' do
let :facts do
{ :osfamily => 'RedHat',
:operatingsystemmajrelease => '7' }
end
it_configures 'ceph profile client'
end
end
# Local Variables:
# compile-command: "cd ../.. ;
# BUNDLE_PATH=/tmp/vendor bundle install ;
# BUNDLE_PATH=/tmp/vendor bundle exec rake spec
# "
# End:

50
spec/classes/ceph_profile_mon_spec.rb
View File

@@ -62,51 +62,13 @@ describe 'ceph::profile::mon' do
)}
end
context 'on Debian' do
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({:hostname => 'first'})
end
let :facts do
{
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'jessie',
:operatingsystem => 'Debian',
:hostname => 'first',
}
it_behaves_like 'ceph profile mon'
end
it_configures 'ceph profile mon'
end
context 'on Ubuntu' do
let :facts do
{
:osfamily => 'Debian',
:lsbdistid => 'Ubuntu',
:lsbdistcodename => 'trusty',
:operatingsystem => 'Ubuntu',
:hostname => 'first',
}
end
it_configures 'ceph profile mon'
end
context 'on RHEL7' do
let :facts do
{ :osfamily => 'RedHat',
:hostname => 'first',
:operatingsystemmajrelease => '7' }
end
it_configures 'ceph profile mon'
end
end
# Local Variables:
# compile-command: "cd ../.. ;
# BUNDLE_PATH=/tmp/vendor bundle install ;
# BUNDLE_PATH=/tmp/vendor bundle exec rake spec
# "
# End:

46
spec/classes/ceph_profile_osd_spec.rb
View File

@@ -42,47 +42,13 @@ describe 'ceph::profile::osd' do
end
end
describe 'on Debian' do
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({})
end
let :facts do
{
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'jessie',
:operatingsystem => 'Debian',
}
it_behaves_like 'ceph profile osd'
end
it_configures 'ceph profile osd'
end
describe 'on Ubuntu' do
let :facts do
{
:osfamily => 'Debian',
:lsbdistid => 'Ubuntu',
:lsbdistcodename => 'trusty',
:operatingsystem => 'Ubuntu',
}
end
it_configures 'ceph profile osd'
end
describe 'on RHEL7' do
let :facts do
{ :osfamily => 'RedHat',
:operatingsystemmajrelease => '7' }
end
it_configures 'ceph profile osd'
end
end
# Local Variables:
# compile-command: "cd ../.. ;
# BUNDLE_PATH=/tmp/vendor bundle install ;
# BUNDLE_PATH=/tmp/vendor bundle exec rake spec
# "
# End:

44
spec/classes/ceph_profile_params_spec.rb
View File

@@ -46,45 +46,13 @@ describe 'ceph::profile::params' do
end
end
context 'on Debian' do
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({})
end
let :facts do
{
:osfamily => 'Debian',
:lsbdistcodename => 'jessie'
}
it_behaves_like 'ceph profile params'
end
it_configures 'ceph profile params'
end
context 'on Ubuntu' do
let :facts do
{
:osfamily => 'Debian',
:lsbdistcodename => 'trusty'
}
end
it_configures 'ceph profile params'
end
context 'on RHEL7' do
let :facts do
{
:osfamily => 'RedHat',
:operatingsystemmajrelease => '7'
}
end
it_configures 'ceph profile params'
end
end
# Local Variables:
# compile-command: "cd ../.. ;
# BUNDLE_PATH=/tmp/vendor bundle install ;
# BUNDLE_PATH=/tmp/vendor bundle exec rake spec
# "
# End:

2
spec/classes/ceph_repo_spec.rb
View File

@@ -28,6 +28,7 @@ describe 'ceph::repo' do
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'jessie',
:lsbdistrelease => '8',
}
end
@@ -83,6 +84,7 @@ describe 'ceph::repo' do
:osfamily => 'Debian',
:lsbdistid => 'Ubuntu',
:lsbdistcodename => 'trusty',
:lsbdistrelease => '14.04',
:hardwaremodel => 'x86_64',
}
end

1
spec/defines/ceph_rgw_apache_fastcgi_spec.rb
View File

@@ -38,6 +38,7 @@ describe 'ceph::rgw::apache_fastcgi' do
:operatingsystem => 'Ubuntu',
:lsbdistid => 'Ubuntu',
:operatingsystemrelease => '14.04',
:lsbdistrelease => '14.04',
:lsbdistcodename => 'trusty',
:pkg_fastcgi => 'libapache2-mod-fastcgi',
}

1
spec/defines/ceph_rgw_apache_spec.rb
View File

@@ -38,6 +38,7 @@ describe 'ceph::rgw::apache' do
:operatingsystemrelease => '14.04',
:lsbdistid => 'Ubuntu',
:lsbdistcodename => 'trusty',
:lsbdistrelease => '14.04',
:pkg_fastcgi => 'libapache2-mod-fastcgi',
}
end

10
spec/defines/ceph_rgw_keystone_spec.rb
View File

@@ -32,6 +32,7 @@ describe 'ceph::rgw::keystone' do
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '14.04',
:lsbdistrelease => '14.04',
}
end
@@ -301,7 +302,7 @@ wget --no-check-certificate http://keystone.custom:5000/v2.0/certificates/signin
'user' => 'apache',
) }
end
end
describe "create with keystone v3 and no pki params" do
@@ -343,10 +344,3 @@ wget --no-check-certificate http://keystone.custom:5000/v2.0/certificates/signin
end
end
# Local Variables:
# compile-command: "cd ../.. ;
# bundle install ;
# bundle exec rake spec
# "
# End: