openstack/puppet-nova
Code Issues Proposed changes

Use libvirt-daemon-system for Ubuntu

Browse Source 
Change-Id: I9301b5451155afa97b56f0ccd3f42c85ffe8ed99
This commit is contained in:
Tobias Urdin
2020-09-03 01:14:22 +02:00
parent 71276558e7
commit e32576aebc
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/params.pp
View File

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

2
spec/classes/nova_compute_libvirt_spec.rb
View File

@@ -30,7 +30,7 @@ describe 'nova::compute::libvirt' do
it { it {
is_expected.to contain_package('libvirt').with( is_expected.to contain_package('libvirt').with(
:name => 'libvirt-bin', :name => 'libvirt-daemon-system',
:ensure => 'present' :ensure => 'present'
) )
is_expected.to contain_package('libvirt').that_requires('Anchor[nova::install::begin]') is_expected.to contain_package('libvirt').that_requires('Anchor[nova::install::begin]')