From a0e403682a02534572d5a7c9433f643ccef15d59 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sat, 18 Jun 2011 16:50:12 -0700
Subject: [PATCH] Added parameter libvirt_type to nova class

need to set it to qemu for vagrant testing
---
 manifests/all.pp     | 7 +++++--
 manifests/compute.pp | 3 +++
 tests/all.pp         | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/manifests/all.pp b/manifests/all.pp
index 494001625..c64b00a87 100644
--- a/manifests/all.pp
+++ b/manifests/all.pp
@@ -12,6 +12,8 @@ class nova::all(
   $rabbit_virtual_host = undef,
   $rabbit_host = undef,
 
+  $libvirt_type = 'qemu',
+
   $flat_network_bridge  = 'br100',
   $flat_network_bridge_ip  = '11.0.0.1',
   $flat_network_bridge_netmask  = '255.255.255.0',
@@ -59,8 +61,9 @@ class nova::all(
   class { "nova::api": enabled => true }
 
   class { "nova::compute":
-    api_server => $ipaddress,
-    enabled => true,
+    api_server   => $ipaddress,
+    libvirt_type => $libvirt_type,
+    enabled      => true,
   }
 
   class { "nova::network::flat":
diff --git a/manifests/compute.pp b/manifests/compute.pp
index 884d85001..4d21b6c8f 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -5,10 +5,13 @@ class nova::compute(
   $enabled = false,
   $api_port = 8773,
   $aws_address = '169.254.169.254'
+  $libvirt_type = 'kvm',
 ) {
 
   Nova_config<| |>~>Service['nova-compute']
 
+  nova_config { 'libvirt_type': value => $libvirt_type }
+
   if $enabled {
     $service_ensure = 'running'
   } else {
diff --git a/tests/all.pp b/tests/all.pp
index 9013bda3c..41c5da5f5 100644
--- a/tests/all.pp
+++ b/tests/all.pp
@@ -31,4 +31,5 @@ class { 'nova::all':
   glance_host => 'localhost',
   glance_port => '9292',
 
+  libvirt_type => 'qemu',
 }