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

[Mark McLoughlin]

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

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

[Vish Ishaya (vishvananda)]

This is correct. When you propose merges, can you set a commit message or a description? It is needed in order to merge. (I went ahead and added it for you on these proposals).

review: Approve

[Thierry Carrez (ttx)]

Please link to a bug so that it's clear it's a bugfix.

[Mark McLoughlin (markmc)]

> This is correct. When you propose merges, can you set a commit message or a
> description? It is needed in order to merge. (I went ahead and added it for
> you on these proposals).

Sure, thanks for your patience - I'm only starting to get the hang of bzr and launchpad :

[Mark McLoughlin (markmc)]

> Please link to a bug so that it's clear it's a bugfix.

Done now

[Jason Kölker (jason-koelker)]

Is Bueno!

[Jason Kölker (jason-koelker)]

review: Approve

[Dan Prince (dan-prince)]

This looks good.

review: Approve

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-09-01 19:22:32 +0000
+++ bin/nova-manage	2011-09-05 07:09:23 +0000
@@ -717,8 +717,7 @@
         bridge_interface = bridge_interface or FLAGS.flat_interface or \
                            FLAGS.vlan_interface
         if not bridge_interface:
-            interface_required = ['nova.network.manager.FlatDHCPManager',
-                                  'nova.network.manager.VlanManager']
+            interface_required = ['nova.network.manager.VlanManager']
             if FLAGS.network_manager in interface_required:
                 raise exception.NetworkNotCreated(req='--bridge_interface')