Adopt changes for upstream 511879

https://review.openstack.org/#/c/511879 modify the virt driver
param, we need make similar changes

Change-Id: I9eb57f93ccef8ca669ae012c6c1dda920488d937
This commit is contained in:
jichenjc 2017-10-18 21:41:24 +08:00
parent f47a2f73d8
commit 9704803789
2 changed files with 4 additions and 4 deletions

View File

@ -292,8 +292,8 @@ class ZVMDriverTestCases(test.NoDBTestCase):
os_distro = self._image_meta.properties.os_distro
self.driver.spawn(self._context, self._instance, self._image_meta,
injected_files=None,
admin_password=None,
injected_files=None, admin_password=None,
allocations=None,
network_info=self._network_info,
block_device_info=self._block_device_info,
flavor=self._flavor)

View File

@ -132,8 +132,8 @@ class ZVMDriver(driver.ComputeDriver):
return self._instance_exists(instance.name)
def spawn(self, context, instance, image_meta, injected_files,
admin_password, network_info=None, block_device_info=None,
flavor=None):
admin_password, allocations, network_info=None,
block_device_info=None, flavor=None):
LOG.info(_("Spawning new instance %s on zVM hypervisor") %
instance['name'], instance=instance)
# For zVM instance, limit the maximum length of instance name to \ 8