fix libvirtd service naming and env file for debian

Change-Id: I6a69e3ad43936d032ac252d8a6c9a1d2bc78bfbd
This commit is contained in:
Jan Klare
2018-04-16 15:11:30 +02:00
parent f9e93ca7f2
commit 000d25feef
3 changed files with 9 additions and 5 deletions

View File

@@ -6,7 +6,7 @@ source_url 'https://github.com/openstack/cookbook-openstack-compute' if respond_
license 'Apache 2.0'
description 'The OpenStack Compute service Nova.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '15.2.0'
version '15.2.1'
chef_version '>= 12.5' if respond_to?(:chef_version)
%w(ubuntu redhat centos).each do |os|

View File

@@ -136,7 +136,11 @@ template '/etc/libvirt/libvirtd.conf' do
notifies :restart, 'service[libvirt-bin]', :immediately
end
template '/etc/default/libvirt-bin' do
# The package libvirt-bin on debian now provides the service libvirtd
# (libvirt-bin is still defined as an alias) and reads its environment from
# /etc/libvirt/libvirtd instead of the previously used
# /etc/default/libvirt-bin.
template '/etc/default/libvirtd' do
source 'libvirt-bin.erb'
owner 'root'
group 'root'

View File

@@ -81,10 +81,10 @@ describe 'openstack-compute::libvirt' do
end
end
describe '/etc/default/libvirt-bin' do
let(:file) { chef_run.template('/etc/default/libvirt-bin') }
describe '/etc/default/libvirtd' do
let(:file) { chef_run.template('/etc/default/libvirtd') }
it 'creates the /etc/default/libvirt-bin file' do
it 'creates the /etc/default/libvirtd file' do
expect(chef_run).to create_template(file.name).with(
owner: 'root',
group: 'root',