lp:~smoser/nova/milestone-block-device-mappings

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/milestone-proposed at revision 1169

OpenStack release team: Pending requested 2011-09-15

Diff: 240 lines (+137/-5)

6 files modified

nova/api/ec2/cloud.py (+24/-2)
nova/db/sqlalchemy/migrate_repo/versions/046_add_instance_swap.py (+48/-0)
nova/db/sqlalchemy/models.py (+2/-0)
nova/tests/test_cloud.py (+3/-1)
nova/virt/disk.py (+41/-0)
nova/virt/libvirt/connection.py (+19/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #827590: cloud-init does not mount ephemeral0 on /mnt in nova	Medium	Fix Released
Bug #827598: ephemeral device does not have a filesystem	Medium	Fix Released
Bug #828357: ephemeral device filesystems should be labeled with 'ephemeralX'	Wishlist	Fix Released

Link a bug report

Related blueprints

1169. By Scott Moser on 2011-09-15

merge in revision 1564 from trunk (fixes LP: #828357, LP: #827598, LP: #827590)

This is just a clean cherry pick of trunk with
  bzr merge -r 1563..1564 ../trunk.dist

I've verified that all of the following are functional:
 - tests are functional:
   $ ./run_tests.sh --no-virtual-env
 - ephemeral0 has a filesystem and is correct in block-device-mapping
   (note bug LP: #851145)
   $ euca-run-instances --block-device-mapping /dev/vdb=ephemeral0 $AMI
 - snapshot can be attached and is correct in block-device-mapping
   $ euca-run-instances --block-device-mapping /dev/vdb=ephemeral0 \
     --block-device-mapping /dev/vdc=snap-00000001 $AMI
 - verify functional swap (note LP: #851218):
   $ ./nova/bin/nova-manage instance_type create --flavor=0 --memory=512 \
        --local_gb=2 --swap=1 --cpu=1 --name "m1.xsmall"
   $ euca-run-instances --instance-type m1.xsmall
    # swap is functional, block device mapping
   $ euca-run-instances --instance-type m1.xsmall \
       --block-device-mapping /dev/vdb=ephemeral0 ami-0000002e
    # swap is functional at /dev/vdc, ephemeral0 at /dev/vdb

1168. By Vish Ishaya on 2011-09-14

Fix issue where floating ips don't get recreated when a network host reboots.

1167. By Thierry Carrez on 2011-09-14

Fixes rogue usage of sudo that crept in

1166. By Sateesh on 2011-09-14

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 VMWareVlanBridgeDriver and added session parmeter to methods to use existing session. Also removed session creation code as session comes as argument.
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://bugs.launchpad.net/nova/+bug/831497
  Bug #839383 in OpenStack Compute (nova): "ESX(i) VIFs and mac addresses"
  https://bugs.launchpad.net/nova/+bug/839383

1165. By Vish Ishaya on 2011-09-13

Deprecate aoe.

1164. By Brian Waldon on 2011-09-12

Backporting fix for bug 844933

1163. By Dan Prince on 2011-09-12

Update GlanceClient, GlanceImageService, and Glance Xen plugin to work with Glance keystone.

1162. By Chuck Short on 2011-09-12

Fixes shutdown of lxc containers.

1161. By Tushar Patil on 2011-09-12

When vpn=true in allocate ip, it attempts to allocate the ip that is reserved in the network. Unfortunately fixed_ip_associate attempts to ignore reserved ips.
This fix allows to filter reserved ip address only when vpn=True.

1160. By Scott Moser on 2011-09-12

use 'qemu-image resize' rather than 'truncate' to grow image files

qcow-image is capable of growing qcow formated disks in addition to
being able to grow a qcow formated one. (LP: #836759)

I've verified that after this change both a full disk uploaded as 'raw' and one that was uploaded as 'qcow2' are correctly resized, and that in oneiric, the instance has its root filesystem resized for /dev/vda1 correctly.