nova: uprev to Liberty

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 1 insertions, 25 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch b/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch
deleted file mode 100644
index 25aa07e..0000000
--- a/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 019f6c2d838aefa9b625bd7a5eadb031fca735cd Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Mon, 27 Jan 2014 16:06:16 -0500
-Subject: [PATCH] nova: add migrate.cfg to the MANIFEST
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- MANIFEST.in |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/MANIFEST.in b/MANIFEST.in
-index c978a52dae21..61e522c610d6 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -1,5 +1,6 @@
- include AUTHORS
- include ChangeLog
-+include nova/db/sqlalchemy/migrate_repo/migrate.cfg
- exclude .gitignore
- exclude .gitreview
- 
--- 
-1.7.10.4
-
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index fe4d756..1082f11 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 # firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
 firewall_driver = nova.virt.firewall.NoopFirewallDriver
-compute_driver = libvirt.LibvirtDriver
+compute_driver = nova.virt.libvirt.LibvirtDriver
 default_floating_pool = public
 fixed_range =
 force_dhcp_release = True