Merge lp:~sateesh-chodapuneedi/nova/esx-multi-nic into lp:~hudson-openstack/nova/trunk
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Dan Prince | ||||||||
Approved revision: | 1527 | ||||||||
Merged at revision: | 1568 | ||||||||
Proposed branch: | lp:~sateesh-chodapuneedi/nova/esx-multi-nic | ||||||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||||||
Diff against target: |
440 lines (+127/-112) 6 files modified
nova/tests/vmwareapi/stubs.py (+0/-2) nova/virt/vmwareapi/fake.py (+1/-1) nova/virt/vmwareapi/vif.py (+11/-16) nova/virt/vmwareapi/vm_util.py (+12/-16) nova/virt/vmwareapi/vmops.py (+63/-47) tools/esx/guest_tool.py (+40/-30) |
||||||||
To merge this branch: | bzr merge lp:~sateesh-chodapuneedi/nova/esx-multi-nic | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dan Prince (community) | Approve | ||
Vish Ishaya (community) | Approve | ||
Review via email: mp+74055@code.launchpad.net |
Description of the change
Multi-NIC support for vmwareapi virt driver in nova.
Does injection of Multi-NIC information to instances with Operating system flavors Ubuntu, Windows and RHEL.
vmwareapi virt driver now relies on calls to network manager instead of nova db calls for network configuration information of instance.
Re-oranized VMWareVlanBridg
Added check for flat_inject flag before attempting an inject operation.
This branch resolves the following bugs:
Bug #831497 in OpenStack Compute (nova): "Instance spawn operation fails on ESXi compute node"
https:/
Bug #839383 in OpenStack Compute (nova): "ESX(i) VIFs and mac addresses"
https:/
Awesome work on this! It will be great to have esx working properly again. Minor nit:
63 - bridge_interface = network[ 'bridge_ interface' ] _vlan_interface
64 + vlan_interface = FLAGS.vmwareapi
can we just use the global vlan interface here?