From 9a76266a4196ce74f12f75b9957a0779bdd682dc Mon Sep 17 00:00:00 2001
From: Vladimir Eremin <veremin@mirantis.com>
Date: Mon, 28 Mar 2016 21:46:17 +0300
Subject: [PATCH] Added requirement between hugetlbfs_mount and libvirt

* Added lost requirement

Change-Id: I468f11772ab142d749ae9aaa0bb2933e027fea60
Closes-Bug: #1556083
---
 deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 3 ++-
 tests/noop/spec/hosts/roles/compute_spec.rb                  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
index f93c5621e8..5bab99e138 100644
--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
+++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
@@ -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'],
     }
 
diff --git a/tests/noop/spec/hosts/roles/compute_spec.rb b/tests/noop/spec/hosts/roles/compute_spec.rb
index 3addafaaea..cd30d96eba 100644
--- a/tests/noop/spec/hosts/roles/compute_spec.rb
+++ b/tests/noop/spec/hosts/roles/compute_spec.rb
@@ -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]')