openstack/cookbook-openstack-compute
Code Issues Proposed changes

Merge "fix libvirtd service naming and env file for debian"

Browse Source
This commit is contained in:
Zuul
2018-04-16 15:29:18 +00:00
committed by Gerrit Code Review
parent 2252e2d80d 8ed820e319
commit 1f93a5962a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/libvirt.rb
View File

@@ -135,7 +135,11 @@ template '/etc/libvirt/libvirtd.conf' do
notifies :restart, 'service[libvirt-bin]', :immediately notifies :restart, 'service[libvirt-bin]', :immediately
end 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' source 'libvirt-bin.erb'
owner 'root' owner 'root'
group 'root' group 'root'

6
spec/libvirt_spec.rb
View File

@@ -70,10 +70,10 @@ describe 'openstack-compute::libvirt' do
end end
end end
describe '/etc/default/libvirt-bin' do describe '/etc/default/libvirtd' do
let(:file) { chef_run.template('/etc/default/libvirt-bin') } 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( expect(chef_run).to create_template(file.name).with(
owner: 'root', owner: 'root',
group: 'root', group: 'root',