summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch24
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova.conf2
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 @@
1From 019f6c2d838aefa9b625bd7a5eadb031fca735cd Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Mon, 27 Jan 2014 16:06:16 -0500
4Subject: [PATCH] nova: add migrate.cfg to the MANIFEST
5
6Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
7---
8 MANIFEST.in | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/MANIFEST.in b/MANIFEST.in
12index c978a52dae21..61e522c610d6 100644
13--- a/MANIFEST.in
14+++ b/MANIFEST.in
15@@ -1,5 +1,6 @@
16 include AUTHORS
17 include ChangeLog
18+include nova/db/sqlalchemy/migrate_repo/migrate.cfg
19 exclude .gitignore
20 exclude .gitreview
21
22--
231.7.10.4
24
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 @@
1[DEFAULT] 1[DEFAULT]
2# firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver 2# firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
3firewall_driver = nova.virt.firewall.NoopFirewallDriver 3firewall_driver = nova.virt.firewall.NoopFirewallDriver
4compute_driver = libvirt.LibvirtDriver 4compute_driver = nova.virt.libvirt.LibvirtDriver
5default_floating_pool = public 5default_floating_pool = public
6fixed_range = 6fixed_range =
7force_dhcp_release = True 7force_dhcp_release = True