From f7f6c282491341a206c4eecb1e2e1d72b9b03651 Mon Sep 17 00:00:00 2001 From: Jan Klare Date: Tue, 20 Dec 2016 12:47:43 +0100 Subject: [PATCH] remove libvirtd opt '-d' because it conflicts with systemd service Change-Id: I05c78aa942509ea8dbd75558f4747d7ac1c4e6bc --- attributes/default.rb | 2 +- spec/libvirt_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 8e31ec31..447dac1f 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -50,7 +50,7 @@ default['openstack']['compute']['rootwrap']['syslog_log_level'] = 'ERROR' default['openstack']['compute']['driver'] = 'libvirt.LibvirtDriver' # libvirtd_opts used in template for /etc/default/libvirt-bin -default['openstack']['compute']['libvirt']['libvirtd_opts'] = '-d -l' +default['openstack']['compute']['libvirt']['libvirtd_opts'] = '-l' default['openstack']['compute']['libvirt']['auth_tcp'] = 'none' # libvirt.max_clients (default: 20) diff --git a/spec/libvirt_spec.rb b/spec/libvirt_spec.rb index 6df602d9..cc5fa445 100644 --- a/spec/libvirt_spec.rb +++ b/spec/libvirt_spec.rb @@ -95,7 +95,7 @@ describe 'openstack-compute::libvirt' do it 'template contents' do [ /^start_libvirtd="yes"$/, - /^libvirtd_opts="-d -l"$/ + /^libvirtd_opts="-l"$/ ].each do |line| expect(chef_run).to render_file(file.name).with_content(line) end