openstack
/
puppet-nova
Code Issues Proposed changes

Do not set special_service_provider on RHEL7. 

RHEL7 uses systemd and should set this to undef as Fedora does.

Change-Id: Ic9a719dfff50bda85d428fba5d665d7b97d8959c
This commit is contained in:
John Eckersberg 2014-04-22 15:16:04 -04:00
parent 9b84c5f84e
commit ae014c9abd
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/params.pp
View File

@ -44,6 +44,13 @@ class nova::params {
'Fedora': {
$special_service_provider = undef
}
'RedHat': {
if ($::operatingsystemrelease < 7) {
$special_service_provider = 'init'
} else {
$special_service_provider = undef
}
}
default: {
$special_service_provider = 'init'
}

17
spec/classes/nova_compute_libvirt_spec.rb
View File

@ -103,7 +103,8 @@ describe 'nova::compute::libvirt' do
describe 'on rhel platforms' do
let :facts do
{ :operatingsystem => 'RedHat', :osfamily => 'RedHat' }
{ :operatingsystem => 'RedHat', :osfamily => 'RedHat',
:operatingsystemrelease => 6.5 }
end
describe 'with default parameters' do
@ -130,6 +131,20 @@ describe 'nova::compute::libvirt' do
:provider => 'init'
) }
describe 'on rhel 7' do
let :facts do
super().merge(:operatingsystemrelease => 7.0)
end
it { should contain_service('libvirt').with(
:provider => nil
)}
it { should contain_service('messagebus').with(
:provider => nil
)}
end
it { should contain_nova_config('DEFAULT/compute_driver').with_value('libvirt.LibvirtDriver')}
it { should contain_nova_config('libvirt/virt_type').with_value('kvm')}
it { should contain_nova_config('DEFAULT/vncserver_listen').with_value('127.0.0.1')}