Merge lp:~smoser/nova/trunk.lp851145 into lp:~hudson-openstack/nova/trunk

[Scott Moser]

create disk.local the same way ephemerals are created (LP: #851145)

If the user did not specify '--block-device-mapping /dev/vdb=ephemeral0', then the first non-root device would end up being created differently then if they had. It would not have a filesystem on it.

This makes 'local_gb' in the libvirt connection created the same way that
it would be if it were named ephemeral0.

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Josh Kearney (jk0)]

LGTM.

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~smoser/nova/trunk.lp851145 into lp:nova failed. Below is the output from the failed tests.

=== modified file 'nova/virt/libvirt/connection.py'
--- nova/virt/libvirt/connection.py	2011-09-16 19:12:55 +0000
+++ nova/virt/libvirt/connection.py	2011-09-16 19:42:24 +0000
@@ -868,9 +868,13 @@
         local_gb = inst['local_gb']
         if local_gb and not self._volume_in_mapping(
             self.default_local_device, block_device_info):
-            self._cache_image(fn=self._create_local,
+            fn = functools.partial(self._create_ephemeral,
+                                   fs_label='ephemeral0',
+                                   os_type=inst.os_type)
+            self._cache_image(fn=fn,
                               target=basepath('disk.local'),
-                              fname="local_%s" % local_gb,
+                              fname="ephemeral_%s_%s_%s" %
+                              ("0", local_gb, inst.os_type),
                               cow=FLAGS.use_cow_images,
                               local_size=local_gb)