diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-07-23 19:17:32 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-07-23 19:17:32 +0000 |
| commit | 7d0758b2f355d5b086b2ea1e9d6b7b7838b3a157 (patch) | |
| tree | 401ecb4f0b7504db1a4cd69e44b9d5d54c1ec533 | |
| parent | 62b75bf7c4259993e493d66d2fdf256d59ed4aa9 (diff) | |
Remove unused user_id and project_id arguments
The code using the arguments was removed a long time ago.
Change-Id: Ic64ce46115617d05e41b6d01c8d403b58f8cacf9
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 3 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 27065e471..601453ff3 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -711,8 +711,7 @@ def generate_ephemeral(session, instance, vm_ref, userdevice, size_gb): size_gb * 1024, FLAGS.default_ephemeral_format) -def create_kernel_image(context, session, instance, image_id, user_id, - project_id, image_type): +def create_kernel_image(context, session, instance, image_id, image_type): """Creates kernel/ramdisk file from the image stored in the cache. If the image is not present in the cache, it streams it from glance. diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 8eef23dd5..785cd614c 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -279,14 +279,14 @@ class VMOps(object): if instance.kernel_id: vdis = vm_utils.create_kernel_image(context, self._session, - instance, instance.kernel_id, instance.user_id, - instance.project_id, vm_utils.ImageType.KERNEL) + instance, instance.kernel_id, + vm_utils.ImageType.KERNEL) kernel_file = vdis['kernel'].get('file') if instance.ramdisk_id: vdis = vm_utils.create_kernel_image(context, self._session, - instance, instance.ramdisk_id, instance.user_id, - instance.project_id, vm_utils.ImageType.RAMDISK) + instance, instance.ramdisk_id, + vm_utils.ImageType.RAMDISK) ramdisk_file = vdis['ramdisk'].get('file') def undo_create_kernel_ramdisk(): |