openstack
/
puppet-nova
Code Issues Proposed changes

Using on_support_os function to test 

Change-Id: I7148c304f9ac3d272ae3e201c5ce021bac2ff5d8
This commit is contained in:
ZhongShengping 2016-04-29 00:10:15 +08:00
parent 2d776cc832
commit e04d996d37
2 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
spec/classes/nova_db_sync_api_spec.rb
View File

@ -31,29 +31,19 @@ describe 'nova::db::sync_api' do
end end
context 'on a RedHat osfamily' do on_supported_os({
let :facts do :supported_os => OSDefaults.get_supported_os
@default_facts.merge({ }).each do |os,facts|
:osfamily => 'RedHat', context "on #{os}" do
:operatingsystemrelease => '7.0', let (:facts) do
:concat_basedir => '/var/lib/puppet/concat' facts.merge(OSDefaults.get_facts({
}) :processorcount => 8,
:concat_basedir => '/var/lib/puppet/concat'
}))
end
it_configures 'nova-dbsync-api'
end end
it_configures 'nova-dbsync-api'
end
context 'on a Debian osfamily' do
let :facts do
@default_facts.merge({
:operatingsystemrelease => '7.8',
:operatingsystem => 'Debian',
:osfamily => 'Debian',
:concat_basedir => '/var/lib/puppet/concat'
})
end
it_configures 'nova-dbsync-api'
end end
end end

34
spec/classes/nova_db_sync_spec.rb
View File

@ -31,29 +31,19 @@ describe 'nova::db::sync' do
end end
context 'on a RedHat osfamily' do on_supported_os({
let :facts do :supported_os => OSDefaults.get_supported_os
@default_facts.merge({ }).each do |os,facts|
:osfamily => 'RedHat', context "on #{os}" do
:operatingsystemrelease => '7.0', let (:facts) do
:concat_basedir => '/var/lib/puppet/concat' facts.merge(OSDefaults.get_facts({
}) :processorcount => 8,
:concat_basedir => '/var/lib/puppet/concat'
}))
end
it_configures 'nova-dbsync'
end end
it_configures 'nova-dbsync'
end
context 'on a Debian osfamily' do
let :facts do
@default_facts.merge({
:operatingsystemrelease => '7.8',
:operatingsystem => 'Debian',
:osfamily => 'Debian',
:concat_basedir => '/var/lib/puppet/concat'
})
end
it_configures 'nova-dbsync'
end end
end end