summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Rosenboom <j.rosenboom@x-ion.de>2017-03-09 12:05:09 +0000
committerJens Rosenboom <j.rosenboom@x-ion.de>2017-03-09 15:32:32 +0000
commit40b6a0627323e264fdd8378277bcd552841e38c1 (patch)
treeae84fb446fdc26b9a8c4f12e7de7dda9ec1bf27c
parentdc339a859d377f040858f452ef7b824d226555fe (diff)
Change libvirt group name
Ubuntu has decided to change the group name from libvirtd to libvirt after Xenial. This change is also in the libvirt packages from the Ocata UCA, so we need to follow them here. Change-Id: Ib87e9b5142b835c4be5e07b9d53e39b48b6f605e
Notes
Notes (review): Code-Review+2: Christoph Albers <c.albers@x-ion.de> Code-Review+2: Samuel Cassiba <s@cassiba.com> Workflow+1: Samuel Cassiba <s@cassiba.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sat, 01 Apr 2017 15:28:35 +0000 Reviewed-on: https://review.openstack.org/443694 Project: openstack/cookbook-openstack-compute Branch: refs/heads/master
-rw-r--r--attributes/default.rb2
-rw-r--r--spec/libvirt-redhat_spec.rb4
-rw-r--r--spec/libvirt_spec.rb4
3 files changed, 5 insertions, 5 deletions
diff --git a/attributes/default.rb b/attributes/default.rb
index 26366a1..bafb661 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -61,7 +61,7 @@ default['openstack']['compute']['libvirt']['max_workers'] = 20
61default['openstack']['compute']['libvirt']['max_requests'] = 20 61default['openstack']['compute']['libvirt']['max_requests'] = 20
62# libvirt.max_client_requests (default: 5) 62# libvirt.max_client_requests (default: 5)
63default['openstack']['compute']['libvirt']['max_client_requests'] = 5 63default['openstack']['compute']['libvirt']['max_client_requests'] = 5
64default['openstack']['compute']['libvirt']['group'] = 'libvirtd' 64default['openstack']['compute']['libvirt']['group'] = 'libvirt'
65default['openstack']['compute']['libvirt']['unix_sock_rw_perms'] = '0770' 65default['openstack']['compute']['libvirt']['unix_sock_rw_perms'] = '0770'
66default['openstack']['compute']['libvirt']['libvirt_inject_key'] = true 66default['openstack']['compute']['libvirt']['libvirt_inject_key'] = true
67# rbd 67# rbd
diff --git a/spec/libvirt-redhat_spec.rb b/spec/libvirt-redhat_spec.rb
index 12ca988..421826b 100644
--- a/spec/libvirt-redhat_spec.rb
+++ b/spec/libvirt-redhat_spec.rb
@@ -16,8 +16,8 @@ describe 'openstack-compute::libvirt' do
16 end 16 end
17 end 17 end
18 18
19 it 'creates libvirtd group and adds nova as a member' do 19 it 'creates libvirt group and adds nova as a member' do
20 expect(chef_run).to create_group('libvirtd').with(members: ['nova']) 20 expect(chef_run).to create_group('libvirt').with(members: ['nova'])
21 end 21 end
22 22
23 it 'symlinks qemu-kvm' do 23 it 'symlinks qemu-kvm' do
diff --git a/spec/libvirt_spec.rb b/spec/libvirt_spec.rb
index cc5fa44..ca555f0 100644
--- a/spec/libvirt_spec.rb
+++ b/spec/libvirt_spec.rb
@@ -16,8 +16,8 @@ describe 'openstack-compute::libvirt' do
16 end 16 end
17 end 17 end
18 18
19 it 'does not create libvirtd group and add to nova' do 19 it 'does not create libvirt group and add to nova' do
20 expect(chef_run).not_to create_group 'libvirtd' 20 expect(chef_run).not_to create_group 'libvirt'
21 end 21 end
22 22
23 it 'does not symlink qemu-kvm' do 23 it 'does not symlink qemu-kvm' do