← Back to branch summary

~0x44/nova/extdoc

« back to all changes in this revision

Viewing changes to nova/virt/vmwareapi/vmops.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/vmwareapi/vmops.py
157
157
            repository.
158
158
            """
159
159
            image_size, image_properties = \
160
 
                    vmware_images.get_vmdk_size_and_properties(
 
160
                    vmware_images.get_vmdk_size_and_properties(context,
161
161
                                       instance.image_ref, instance)
162
162
            vmdk_file_size_in_kb = int(image_size) / 1024
163
163
            os_type = image_properties.get("vmware_ostype", "otherGuest")
282
282
            # Upload the -flat.vmdk file whose meta-data file we just created
283
283
            # above
284
284
            vmware_images.fetch_image(
 
285
                context,
285
286
                instance.image_ref,
286
287
                instance,
287
288
                host=self._session._host_ip,
448
449
            # Upload the contents of -flat.vmdk file which has the disk data.
449
450
            LOG.debug(_("Uploading image %s") % snapshot_name)
450
451
            vmware_images.upload_image(
 
452
                context,
451
453
                snapshot_name,
452
454
                instance,
453
455
                os_type=os_type,