diff --git a/packstack/puppet/templates/nova_compute.pp b/packstack/puppet/templates/nova_compute.pp
index 66636946e..3e6a460e3 100644
--- a/packstack/puppet/templates/nova_compute.pp
+++ b/packstack/puppet/templates/nova_compute.pp
@@ -85,3 +85,10 @@ if($::operatingsystem == 'Fedora') {
     }
 }
 Package['libvirt'] -> Service['messagebus'] -> Service['libvirt']
+
+file_line { 'libvirt-guests':
+    path  => '/etc/sysconfig/libvirt-guests',
+    line  => 'ON_BOOT=ignore',
+    match => '^[\s#]*ON_BOOT=.*',
+    require => Class['nova::compute::libvirt']
+}