From c813af2d7f441ac5e8506a5df2db256ebacbe875 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 3 Sep 2012 16:43:37 +0100 Subject: Fix vmwareapi driver spawn() signature Fixes bug #1045393 commit 99fb9d2a changed the signature of the spawn() method but not all drivers were updated for the change. The injected_files and admin_password instance attributes were ignored by the hyperv driver before, so we can just ignore them in spawn() now that they are being passed as function arguments. Change-Id: Ifc4279a05127dcc5c01388882c40570bf6de5ff2 --- nova/virt/vmwareapi/driver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 98d5dc306..ec8673418 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -126,8 +126,8 @@ class VMWareESXDriver(driver.ComputeDriver): """List VM instances.""" return self._vmops.list_instances() - def spawn(self, context, instance, image_meta, network_info, - block_device_mapping=None): + def spawn(self, context, instance, image_meta, injected_files, + admin_password, network_info=None, block_device_info=None): """Create VM instance.""" self._vmops.spawn(context, instance, image_meta, network_info) -- cgit