commit 4c0e728780d49bfca80b147676ad1b96d16e24e4
author Jenkins <jenkins@review.openstack.org> Fri Mar 28 13:45:55 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 28 13:45:55 2014 +0000
tree 3ef172252c2926b35eccca9ebd8c5e6d680a7d61
parent 64ccbea8cfa7813574a7085bcfaebcc7a98c65e1
parent b0f8beb8f1e851321f2d03d2ae687dc2ba2e296e

Merge "Install qemu-kvm instead of kvm package on Ubuntu"

files/apts/nova

diff --git a/files/apts/nova b/files/apts/nova
index ae925c3..60119ad 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -12,7 +12,7 @@
 ebtables
 sqlite3
 sudo
-kvm # NOPRIME
+qemu-kvm # NOPRIME
 qemu # dist:wheezy,jessie NOPRIME
 libvirt-bin # NOPRIME
 libjs-jquery-tablesorter # Needed for coverage html reports

lib/nova_plugins/functions-libvirt

diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
index adffe01..1f2b239 100644
--- a/lib/nova_plugins/functions-libvirt
+++ b/lib/nova_plugins/functions-libvirt
@@ -18,7 +18,7 @@
 # Installs required distro-specific libvirt packages.
 function install_libvirt {
     if is_ubuntu; then
-        install_package kvm
+        install_package qemu-kvm
         install_package libvirt-bin
         install_package python-libvirt
         install_package python-guestfs