diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-04 01:45:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-04 01:45:09 +0000 |
| commit | aa831756ac976187928398c8591768e97bda8c39 (patch) | |
| tree | e1e401adc6a6eafdf6ed0195c090913959d227be /nova/virt | |
| parent | 99bc7c2858e473833a778191b11fc66c71201cfe (diff) | |
| parent | c813af2d7f441ac5e8506a5df2db256ebacbe875 (diff) | |
Merge "Fix vmwareapi driver spawn() signature"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/vmwareapi/driver.py | 4 |
1 files changed, 2 insertions, 2 deletions
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) |