From 8ed820e31997a5ad2ceb6d70098ff5d33790897f Mon Sep 17 00:00:00 2001 From: Jan Klare Date: Mon, 16 Apr 2018 15:11:30 +0200 Subject: [PATCH] fix libvirtd service naming and env file for debian Change-Id: I6a69e3ad43936d032ac252d8a6c9a1d2bc78bfbd --- recipes/libvirt.rb | 6 +++++- spec/libvirt_spec.rb | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes/libvirt.rb b/recipes/libvirt.rb index e5aae2fc..c020f6fb 100644 --- a/recipes/libvirt.rb +++ b/recipes/libvirt.rb @@ -135,7 +135,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' diff --git a/spec/libvirt_spec.rb b/spec/libvirt_spec.rb index c7a6339d..010ec712 100644 --- a/spec/libvirt_spec.rb +++ b/spec/libvirt_spec.rb @@ -70,10 +70,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',