Updated openstack/openstack
Project: openstack/nova  c627f1657e5cd57b7a04b22d087cdac5e756e3e2
null
Add helper method for injecting data in an image

Add a _inject_data method whish helps to injecting data
in a disk image file system.
Update the _create_image method to use this helper

Change-Id: Ia005eee0a34d77bbf3eb33f7fef231dcf1eabe2c
Related-Bug: #1271528
Updated openstack/openstack
Project: openstack/nova  b956832d23d1c3107a1a44d60a75afc630d4c99a
null
Prevent rescheduling on block device failure

Due to a race condition - it is possible for more instances to race for
the same volume. In such a scenario, the one that fails will get
rescheduled, and in the process detach the volume of a successful
instance.

To prevent this, this patch makes nova not reschedule on block device
failures. This is actually reasonable behaviour as block device failures
are rarely related to the compute host itself and so rescheduling is not
usually useful.

This bug does not exist in the new boot code in the manager which will
be used once remove-cast-to-schedule-run-instance bp lands (see
Iefab71047996b7cc08107794d5bc628c11680a70). However, it is now clear
that this will not be merged for Icehouse, so this patch is a
"forward port" of a patch we already applied to stable/havana.

Closes-bug: #1195947

Change-Id: I6b68965ac65cdb0e1da3b44e83428f056b1693aa