lp://qastaging/~bgh/nova/qmanager-rbp-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://qastaging/~hudson-openstack/nova/trunk

Vish Ishaya (community): Approve on 2011-09-15

Diff: 289 lines (+85/-73)

7 files modified

bin/nova-manage (+1/-1)
nova/network/quantum/client.py (+0/-2)
nova/network/quantum/manager.py (+41/-22)
nova/network/quantum/melange_ipam_lib.py (+25/-26)
nova/network/quantum/nova_ipam_lib.py (+3/-2)
nova/network/quantum/quantum_connection.py (+10/-14)
nova/tests/test_quantum.py (+5/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1542. By Brad Hall on 2011-09-06

Fix quantum/melange ipam interaction

We now query for the subnets by net_id/vif_id instead of searching through all
the blocks to find the right one. Both of the allocate and deallocate for
instance calls are now using the vif_id -> network_id mapping instead of
searching the quantum networks. get_port_by_attachment was also changed to
take a net_id so that we don't have to search through all of the quantum
networks to find the corresponding port.

1541. By Thierry Carrez on 2011-09-09

Last Diablo translations for Nova

1540. By Anthony Young on 2011-09-08

fix for lp844364: fix check for fixed_ip association in os-floating-ips

1539. By Tushar Patil on 2011-09-08

NetworkManager's add_fixed_ip_to_instance calls _allocate_fixed_ips without vpn or requested_networks parameters. If vpn or requested_networks is not provided to the _allocate_fixed_ips method, it throws an exception. This issue is fixed now.

1538. By Kevin L. Mitchell on 2011-09-08

One more bug fix to make zones work in trunk. Basic problem is that in novaclient using the 1.0 OSAPI, servers.create() takes an ipgroups argument, but when using the 1.1 OSAPI, it doesn't, which means booting instances in child zones won't work with OSAPI v1.0. This fix works around that by using keyword arguments for all the arguments after the flavor, and dropping the unused ipgroups argument.

1537. By Chris Behrens on 2011-09-08

Fixes the reroute_compute decorator in the scheduler API so that it properly:

1) Raises InstanceNotFound when all zones return no instance
2) If an instance is found in a zone, ignore whether other zones may be down. Return the instance
information, catching the novaclient exceptions from the other zones.
3) If a zone is down and no instances are found in other zones, raise a ZoneRequestError... as it's possible the instance exists in the downed zones.

1536. By Chris Behrens on 2011-09-08

Fix lp:844155

When using an abstract scheduler class, if no compute hosts are available locally, the checking of child zones is short circuited. I've removed the broken check.

1535. By Keisuke Tagami on 2011-09-08

Changing a behavior of update_dhcp() to write out dhcp options file.
This option file make dnsmasq offer a default gateway to only NICs of VM belonging to a network that the first NIC of VM belongs to.
So, first NIC of VM must be connected to a network that a correct default gateway exists in.
By means of this, VM will not get incorrect default gateways.

1534. By Kevin L. Mitchell on 2011-09-08

Make weigh_hosts() return a host per instance, instead of just a list of hosts.

1533. By Josh Kearney on 2011-09-08

Do not attempt to mount the swap VDI for file injection.