Added requirement between hugetlbfs_mount and libvirt
* Added lost requirement Change-Id: I468f11772ab142d749ae9aaa0bb2933e027fea60 Closes-Bug: #1556083
This commit is contained in:
parent
99f4909ad8
commit
9a76266a41
|
@ -221,7 +221,7 @@ class openstack_tasks::roles::compute {
|
||||||
$libvirt_hugetlbfs_mount = 'set hugetlbfs_mount /run/hugepages/kvm'
|
$libvirt_hugetlbfs_mount = 'set hugetlbfs_mount /run/hugepages/kvm'
|
||||||
} else {
|
} else {
|
||||||
$qemu_hugepages_value = 'rm KVM_HUGEPAGES'
|
$qemu_hugepages_value = 'rm KVM_HUGEPAGES'
|
||||||
$libvirt_hugetlbfs_mount = 'rm hugetlbfs_mount'
|
$libvirt_hugetlbfs_mount = 'set hugetlbfs_mount ""'
|
||||||
}
|
}
|
||||||
augeas { 'qemu_hugepages':
|
augeas { 'qemu_hugepages':
|
||||||
context => '/files/etc/default/qemu-kvm',
|
context => '/files/etc/default/qemu-kvm',
|
||||||
|
@ -231,6 +231,7 @@ class openstack_tasks::roles::compute {
|
||||||
augeas { 'libvirt_hugetlbfs_mount':
|
augeas { 'libvirt_hugetlbfs_mount':
|
||||||
context => '/files/etc/libvirt/qemu.conf',
|
context => '/files/etc/libvirt/qemu.conf',
|
||||||
changes => $libvirt_hugetlbfs_mount,
|
changes => $libvirt_hugetlbfs_mount,
|
||||||
|
require => Package[$::nova::params::libvirt_package_name],
|
||||||
notify => Service['libvirt'],
|
notify => Service['libvirt'],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -202,7 +202,7 @@ describe manifest do
|
||||||
libvirt_hugetlbfs_mount = 'set hugetlbfs_mount /run/hugepages/kvm'
|
libvirt_hugetlbfs_mount = 'set hugetlbfs_mount /run/hugepages/kvm'
|
||||||
else
|
else
|
||||||
qemu_hugepages_value = 'rm KVM_HUGEPAGES'
|
qemu_hugepages_value = 'rm KVM_HUGEPAGES'
|
||||||
libvirt_hugetlbfs_mount = 'rm hugetlbfs_mount'
|
libvirt_hugetlbfs_mount = 'set hugetlbfs_mount ""'
|
||||||
end
|
end
|
||||||
|
|
||||||
if facts[:osfamily] == 'Debian'
|
if facts[:osfamily] == 'Debian'
|
||||||
|
@ -214,6 +214,7 @@ describe manifest do
|
||||||
should contain_augeas('libvirt_hugetlbfs_mount').with(
|
should contain_augeas('libvirt_hugetlbfs_mount').with(
|
||||||
'context' => '/files/etc/libvirt/qemu.conf',
|
'context' => '/files/etc/libvirt/qemu.conf',
|
||||||
'changes' => libvirt_hugetlbfs_mount,
|
'changes' => libvirt_hugetlbfs_mount,
|
||||||
|
'require' => 'Package[libvirt-bin]',
|
||||||
).that_notifies('Service[libvirt]')
|
).that_notifies('Service[libvirt]')
|
||||||
|
|
||||||
should contain_augeas('qemu_hugepages').that_notifies('Service[qemu-kvm]')
|
should contain_augeas('qemu_hugepages').that_notifies('Service[qemu-kvm]')
|
||||||
|
|
Loading…
Reference in New Issue