summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam R. Howlett <Liam.Howlett@WindRiver.com>2014-08-28 12:32:33 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-09-04 15:06:44 -0400
commit310c8efc04aad1ff3d0bea28931dbdfc77b1252b (patch)
tree635ffd76e102af4fd9d6d2dfb742ed4bcb9ad533
parent0ce2ee6f409ad264f9e8fc492e7c63cc4ab4e1bd (diff)
downloadmeta-cloud-services-310c8efc04aad1ff3d0bea28931dbdfc77b1252b.tar.gz
python-nova: Remove duplicate line from conf file.
Removed duplicate dhcpbridge_flagfile from the nova.conf file. Signed-off-by: Liam R. Howlett <Liam.Howlett@WindRiver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index 59a6b52..09ae44c 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -6,7 +6,6 @@ default_floating_pool = public
6fixed_range = 6fixed_range =
7force_dhcp_release = True 7force_dhcp_release = True
8dhcpbridge_flagfile = /etc/nova/nova.conf 8dhcpbridge_flagfile = /etc/nova/nova.conf
9dhcpbridge_flagfile = /etc/nova/nova.conf
10compute_scheduler_driver = nova.scheduler.filter_scheduler.FilterScheduler 9compute_scheduler_driver = nova.scheduler.filter_scheduler.FilterScheduler
11rootwrap_config = /etc/nova/rootwrap.conf 10rootwrap_config = /etc/nova/rootwrap.conf
12api_paste_config = /etc/nova/api-paste.ini 11api_paste_config = /etc/nova/api-paste.ini