Merge "Add guestfs packages for libvirt support"

This commit is contained in:
Jenkins 2015-06-12 02:01:38 +00:00 committed by Gerrit Code Review
commit 6cec78adf6
3 changed files with 8 additions and 5 deletions

View File

@ -467,7 +467,7 @@ when 'fedora', 'rhel', 'suse' # :pragma-foodcritic: ~FC024 - won't fix this
'compute_vncproxy_service' => 'openstack-nova-novncproxy',
'compute_vncproxy_consoleauth_packages' => ['openstack-nova-console'],
'compute_vncproxy_consoleauth_service' => 'openstack-nova-consoleauth',
'libvirt_packages' => ['libvirt', 'device-mapper'],
'libvirt_packages' => ['libvirt', 'device-mapper', 'python-libguestfs'],
'libvirt_service' => 'libvirtd',
'libvirt_ceph_packages' => ['ceph-common'],
'dbus_service' => 'messagebus',
@ -519,7 +519,7 @@ when 'debian'
'compute_vncproxy_service' => 'nova-novncproxy',
'compute_vncproxy_consoleauth_packages' => ['nova-consoleauth'],
'compute_vncproxy_consoleauth_service' => 'nova-consoleauth',
'libvirt_packages' => ['libvirt-bin'],
'libvirt_packages' => ['libvirt-bin', 'python-guestfs'],
'libvirt_service' => 'libvirt-bin',
'libvirt_ceph_packages' => ['ceph-common'],
'dbus_service' => 'dbus',

View File

@ -11,8 +11,9 @@ describe 'openstack-compute::libvirt' do
include_context 'compute_stubs'
it 'upgrades libvirt packages' do
expect(chef_run).to upgrade_package 'libvirt'
expect(chef_run).to upgrade_package 'device-mapper'
%w(libvirt device-mapper python-libguestfs).each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'creates libvirtd group and adds nova as a member' do

View File

@ -11,7 +11,9 @@ describe 'openstack-compute::libvirt' do
include_context 'compute_stubs'
it 'upgrades libvirt packages' do
expect(chef_run).to upgrade_package 'libvirt-bin'
%w(libvirt-bin python-guestfs).each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'does not create libvirtd group and add to nova' do