OpenStack Compute (nova)

Merge lp:~markmc/nova/flat-dhcp-without-bridge-iface into lp:~hudson-openstack/nova/milestone-proposed

  1. flat-dhcp-without-bridge-iface
  2. Merge into milestone-proposed
Proposed by Vish Ishaya
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1484
Merged at revision: 1159
Proposed branch: lp:~markmc/nova/flat-dhcp-without-bridge-iface
Merge into: lp:~hudson-openstack/nova/milestone-proposed
Diff against target: 12 lines (+1/-2)
1 file modified
bin/nova-manage (+1/-2)
To merge this branch: bzr merge lp:~markmc/nova/flat-dhcp-without-bridge-iface
Reviewer Review Type Date Requested Status
OpenStack release team Pending
Review via email: mp+74915@code.launchpad.net

Description of the change

Do not require --bridge_interface for FlatDHCPManager (lp:844944)

Unlike VlanManager, FlatDHCPManager actually works fine without a bridge
interface on single host deployments.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/nova-manage'
2--- bin/nova-manage 2011-09-09 09:24:28 +0000
3+++ bin/nova-manage 2011-09-11 16:21:38 +0000
4@@ -724,8 +724,7 @@
5 bridge_interface = bridge_interface or FLAGS.flat_interface or \
6 FLAGS.vlan_interface
7 if not bridge_interface:
8- interface_required = ['nova.network.manager.FlatDHCPManager',
9- 'nova.network.manager.VlanManager']
10+ interface_required = ['nova.network.manager.VlanManager']
11 if FLAGS.network_manager in interface_required:
12 raise exception.NetworkNotCreated(req='--bridge_interface')
13

Subscribers

People subscribed via source and target branches