openstack
/
puppet-nova
Code Issues Proposed changes

change libvirt package name on debian stretch and up 

the package libvirt-bin does not exist anymore on debian
stretch and newer.

Change-Id: Id1f0fdd328f927d583e2efe36baa8e520cbc2988
This commit is contained in:
Benedikt Trefzer 2017-09-09 14:47:03 +02:00
parent a3a34fb0c0
commit 8afacd7551
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/params.pp
View File

@ -81,7 +81,11 @@ class nova::params {
$conductor_package_name = 'nova-conductor'
$consoleauth_package_name = 'nova-consoleauth'
$doc_package_name = 'nova-doc'
$libvirt_package_name = 'libvirt-bin'
if ($::operatingsystem == 'Debian') and (versioncmp($::operatingsystemmajrelease, '9') >= 0 ) {
$libvirt_package_name = 'libvirt-daemon-system'
} else {
$libvirt_package_name = 'libvirt-bin'
}
$network_package_name = 'nova-network'
$scheduler_package_name = 'nova-scheduler'
$tgt_package_name = 'tgt'

5
spec/classes/nova_serial_proxy_spec.rb
View File

@ -67,8 +67,9 @@ describe 'nova::serialproxy' do
context 'on Debian system' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Debian'
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemmajrelease => '9'
})
end

7
spec/classes/nova_spicehtml5_proxy_spec.rb
View File

@ -64,9 +64,10 @@ describe 'nova::spicehtml5proxy' do
context 'on Debian system' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:os_package_type => 'debian'
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemmajrelease => '9',
:os_package_type => 'debian'
})
end

7
spec/classes/nova_vnc_proxy_spec.rb
View File

@ -49,9 +49,10 @@ describe 'nova::vncproxy' do
describe 'on debian OS' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:os_package_type => 'debian'
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemmajrelease => '9',
:os_package_type => 'debian'
})
end
it { is_expected.to contain_package('nova-vncproxy').with(