diff options
| author | Liam R. Howlett <Liam.Howlett@WindRiver.com> | 2014-08-28 12:32:33 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-04 15:06:44 -0400 |
| commit | 310c8efc04aad1ff3d0bea28931dbdfc77b1252b (patch) | |
| tree | 635ffd76e102af4fd9d6d2dfb742ed4bcb9ad533 /meta-openstack/recipes-devtools/python/python-nova | |
| parent | 0ce2ee6f409ad264f9e8fc492e7c63cc4ab4e1bd (diff) | |
| download | meta-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>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/nova.conf | 1 |
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 | |||
| 6 | fixed_range = | 6 | fixed_range = |
| 7 | force_dhcp_release = True | 7 | force_dhcp_release = True |
| 8 | dhcpbridge_flagfile = /etc/nova/nova.conf | 8 | dhcpbridge_flagfile = /etc/nova/nova.conf |
| 9 | dhcpbridge_flagfile = /etc/nova/nova.conf | ||
| 10 | compute_scheduler_driver = nova.scheduler.filter_scheduler.FilterScheduler | 9 | compute_scheduler_driver = nova.scheduler.filter_scheduler.FilterScheduler |
| 11 | rootwrap_config = /etc/nova/rootwrap.conf | 10 | rootwrap_config = /etc/nova/rootwrap.conf |
| 12 | api_paste_config = /etc/nova/api-paste.ini | 11 | api_paste_config = /etc/nova/api-paste.ini |