Merge "Fix configuring libvirt before installation"

manifests/migration/libvirt.pp

@@ -4,6 +4,8 @@
 #
 class nova::migration::libvirt {
 
+  Package['libvirt'] -> File_line<| path == '/etc/libvirt/libvirtd.conf' |>
+
   case $::osfamily {
     'RedHat': {
       file_line { '/etc/libvirt/libvirtd.conf listen_tls':
@@ -32,6 +34,8 @@ class nova::migration::libvirt {
         line  => 'LIBVIRTD_ARGS="--listen"',
         match => 'LIBVIRTD_ARGS=',
       }
+
+      Package['libvirt'] -> File_line<| path == '/etc/sysconfig/libvirtd' |>
     }
 
     'Debian': {
@@ -62,6 +66,7 @@ class nova::migration::libvirt {
         match => 'libvirtd_opts=',
       }
 
+      Package['libvirt'] -> File_line<| path == '/etc/default/libvirt-bin' |>
     }
 
     default:  {

spec/classes/nova_migration_libvirt_spec.rb

@@ -22,6 +22,13 @@ require 'spec_helper'
 
 describe 'nova::migration::libvirt' do
 
+
+  let :pre_condition do
+   'include nova
+    include nova::compute
+    include nova::compute::libvirt'
+  end
+
   shared_examples_for 'nova migration with libvirt' do
 
     it 'configure libvirtd.conf' do