Update to Move libvirt options into a group

Nova has moved the the libvirt options into a group
in the config file, this patch aligns packstack templates
to this new configuration.
This patch needs this pull request to be approved first:
redhat-openstack/openstack-puppet-modules#37

Change-Id: I14027588dd10e8e13af356ec53a9958f49039fb1
Fixes: rhbz#1093925

Author: imcsk8

packstack/puppet/templates/nova_compute_libvirt.pp

@@ -4,16 +4,14 @@
 # preventing a clash with rules being set by libvirt
 
 if $::is_virtual_packstack == "true" {
-    $libvirt_type = "qemu"
-    nova_config{
-        "DEFAULT/libvirt_cpu_mode": value => "none";
-    }
+    $libvirt_virt_type = "qemu"
+    $libvirt_cpu_mode = "none"
 }else{
-    $libvirt_type = "kvm"
+    $libvirt_virt_type = "kvm"
 }
 
 nova_config{
-  "DEFAULT/libvirt_inject_partition": value => "-1";
+  "libvirt/inject_partition": value => "-1";
 }
 
 exec { 'qemu-kvm':
@@ -23,8 +21,9 @@
 }
 
 class { 'nova::compute::libvirt':
-  libvirt_type                => "$libvirt_type",
-  vncserver_listen            => "0.0.0.0",
+  libvirt_virt_type  => "$libvirt_virt_type",
+  libvirt_cpu_mode   => "$libvirt_cpu_mode",
+  vncserver_listen   => "0.0.0.0",
 }
 
 exec {'load_kvm':