lp:~danwent/nova/linuxnet_vifplug

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1449

Dan Prince (community): Approve on 2011-08-16

Trey Morris (community): Approve on 2011-08-16

Jason Kölker (community): Approve on 2011-08-05

Diff: 636 lines (+260/-152)

4 files modified

bin/nova-dhcpbridge (+6/-6)
nova/network/linux_net.py (+232/-128)
nova/network/manager.py (+18/-16)
nova/virt/libvirt/vif.py (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1301. By dan wendlandt on 2011-08-15

fix missing 'run_as_root' from bad merge

1300. By dan wendlandt on 2011-08-14

have NetworkManager generate MAC address and pass it to the driver for plugging. Sets the stage for being able to do duplicate checks on those MACs as well.

1299. By dan wendlandt on 2011-08-13

fix issue introduced in merge

1298. By dan wendlandt on 2011-08-13

merge trunk, fix conflict frim dprince's branch to remove hostname from bin/nova-dhcpbridge

1297. By dan wendlandt on 2011-08-13

merge in trunk, resolving conflicts with ttx's branch to switch from using sudo to run_as_root=True

1296. By dan wendlandt on 2011-08-04

move ensure_vlan_bridge,ensure_bridge,ensure_vlan to the bridge/vlan specific vif-plugging driver

1295. By dan wendlandt on 2011-08-04

another merge

1294. By dan wendlandt on 2011-08-04

modify _setup_network for flatDHCP as well

1293. By dan wendlandt on 2011-08-02

fix LinuxBridgeInterfaceDriver

1292. By dan wendlandt on 2011-08-02

merge trunk, resolve conflict in net/manater.py in favor of vif-plug