From e32576aebc31311e6dbc76b12e6a782481633fe8 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Thu, 3 Sep 2020 01:14:22 +0200 Subject: [PATCH] Use libvirt-daemon-system for Ubuntu Change-Id: I9301b5451155afa97b56f0ccd3f42c85ffe8ed99 --- manifests/params.pp | 6 +----- spec/classes/nova_compute_libvirt_spec.rb | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index e8d856232..042fa2acc 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -71,11 +71,7 @@ class nova::params { $conductor_package_name = 'nova-conductor' $novajoin_package_name = undef $doc_package_name = 'nova-doc' - if ($::operatingsystem == 'Debian') and (versioncmp($::operatingsystemmajrelease, '9') >= 0 ) { - $libvirt_package_name = 'libvirt-daemon-system' - } else { - $libvirt_package_name = 'libvirt-bin' - } + $libvirt_package_name = 'libvirt-daemon-system' $scheduler_package_name = 'nova-scheduler' $tgt_package_name = 'tgt' $ceph_client_package_name = 'ceph' diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb index dd8431ed0..6d78ffe48 100644 --- a/spec/classes/nova_compute_libvirt_spec.rb +++ b/spec/classes/nova_compute_libvirt_spec.rb @@ -30,7 +30,7 @@ describe 'nova::compute::libvirt' do it { is_expected.to contain_package('libvirt').with( - :name => 'libvirt-bin', + :name => 'libvirt-daemon-system', :ensure => 'present' ) is_expected.to contain_package('libvirt').that_requires('Anchor[nova::install::begin]')