Merge "Use is_virtual instead of is_virtual_packstack"

packstack/puppet/modules/packstack/lib/facter/is_virtual_packstack.rb

@@ -1,9 +0,0 @@
-
-# is_virtual doesn't seem to work on all kvm vm's
-# this custom one seem to do better
-
-Facter.add("is_virtual_packstack") do
-  setcode do
-    Facter::Util::Resolution.exec('grep hypervisor /proc/cpuinfo > /dev/null && echo true || echo false')
-  end
-end

packstack/puppet/templates/nova_compute_libvirt.pp

@@ -3,7 +3,7 @@ Firewall <| |> -> Class['nova::compute::libvirt']
 # Ensure Firewall changes happen before libvirt service start
 # preventing a clash with rules being set by libvirt
 
-if $::is_virtual_packstack == 'true' {
+if $::is_virtual == 'true' {
   $libvirt_virt_type = 'qemu'
   $libvirt_cpu_mode = 'none'
 } else {