openstack
/
fuel-library
Code Issues Proposed changes

Added requirement between hugetlbfs_mount and libvirt 

* Added lost requirement

Change-Id: I468f11772ab142d749ae9aaa0bb2933e027fea60
Closes-Bug: #1556083
This commit is contained in:
Vladimir Eremin 2016-03-28 21:46:17 +03:00 committed by Vladimir Kuklin
parent 99f4909ad8
commit 9a76266a41
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/openstack_tasks/manifests/roles/compute.pp
View File

@ -221,7 +221,7 @@ class openstack_tasks::roles::compute {
$libvirt_hugetlbfs_mount = 'set hugetlbfs_mount /run/hugepages/kvm'
} else {
$qemu_hugepages_value = 'rm KVM_HUGEPAGES'
$libvirt_hugetlbfs_mount = 'rm hugetlbfs_mount'
$libvirt_hugetlbfs_mount = 'set hugetlbfs_mount ""'
}
augeas { 'qemu_hugepages':
context => '/files/etc/default/qemu-kvm',
@ -231,6 +231,7 @@ class openstack_tasks::roles::compute {
augeas { 'libvirt_hugetlbfs_mount':
context => '/files/etc/libvirt/qemu.conf',
changes => $libvirt_hugetlbfs_mount,
require => Package[$::nova::params::libvirt_package_name],
notify => Service['libvirt'],
}

3
tests/noop/spec/hosts/roles/compute_spec.rb
View File

@ -202,7 +202,7 @@ describe manifest do
libvirt_hugetlbfs_mount = 'set hugetlbfs_mount /run/hugepages/kvm'
else
qemu_hugepages_value = 'rm KVM_HUGEPAGES'
libvirt_hugetlbfs_mount = 'rm hugetlbfs_mount'
libvirt_hugetlbfs_mount = 'set hugetlbfs_mount ""'
end
if facts[:osfamily] == 'Debian'
@ -214,6 +214,7 @@ describe manifest do
should contain_augeas('libvirt_hugetlbfs_mount').with(
'context' => '/files/etc/libvirt/qemu.conf',
'changes' => libvirt_hugetlbfs_mount,
'require' => 'Package[libvirt-bin]',
).that_notifies('Service[libvirt]')
should contain_augeas('qemu_hugepages').that_notifies('Service[qemu-kvm]')