Merge "Fixes spawn method signature for PowerVM driver."

2 files changed, 4 insertions, 17 deletions

diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py
index 13d9cdd58..f40ef534c 100644
--- a/nova/tests/test_powervm.py
+++ b/nova/tests/test_powervm.py
@@ -146,7 +146,7 @@ class PowerVMDriverTestCase(test.TestCase):
         image_meta = {}
         image_meta['id'] = '666'
         self.powervm_connection.spawn(context.get_admin_context(),
-                                      self.instance, image_meta)
+                                      self.instance, image_meta, 's3cr3t', [])
         state = self.powervm_connection.get_info(self.instance)['state']
         self.assertEqual(state, power_state.RUNNING)
 
diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py
index 0ee52105a..06c17447c 100644
--- a/nova/virt/powervm/driver.py
+++ b/nova/virt/powervm/driver.py
@@ -105,22 +105,9 @@ class PowerVMDriver(driver.ComputeDriver):
     def plug_vifs(self, instance, network_info):
         pass
 
-    def spawn(self, context, instance, image_meta,
-              network_info=None, block_device_info=None):
-        """
-        Create a new instance/VM/domain on powerVM.
-
-        :param context: security context
-        :param instance: Instance object as returned by DB layer.
-                         This function should use the data there to guide
-                         the creation of the new instance.
-        :param image_meta: image object returned by nova.image.glance that
-                           defines the image from which to boot this instance
-        :param network_info:
-           :py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info`
-        :param block_device_info: Information about block devices to be
-                                  attached to the instance.
-        """
+    def spawn(self, context, instance, image_meta, injected_files,
+              admin_password, network_info=None, block_device_info=None):
+        """Create a new instance/VM/domain on powerVM."""
         self._powervm.spawn(context, instance, image_meta['id'])
 
     def destroy(self, instance, network_info, block_device_info=None):