openstack/fuel-qa
Code Issues Proposed changes

Remove redundant uploading ISO

Browse Source 
Fuel-devops is making a template on-the-fly, taking
into account the option settings.ADMIN_BOOT_DEVICE
(see describe_environment(boot_from=settings.ADMIN_BOOT_DEVICE)).

ISO is uploaded during the environment creation in fuel-devops.

Change-Id: I3a6f850b66873ab704649268c073a24147820568
Closes-Bug:#1544939
This commit is contained in:
Dennis Dmitriev 2016-02-12 14:03:11 +02:00
parent 6d1d0d7f36
commit 4c90d34728
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuelweb_test/models/environment.py
View File

@ -442,15 +442,10 @@ class EnvironmentModel(object):
build_images=settings.BUILD_IMAGES, build_images=settings.BUILD_IMAGES,
iso_connect_as=settings.ADMIN_BOOT_DEVICE, iso_connect_as=settings.ADMIN_BOOT_DEVICE,
security=settings.SECURITY_TEST): security=settings.SECURITY_TEST):
# start admin node # Create environment and start the Fuel master node
admin = self.d_env.nodes().admin admin = self.d_env.nodes().admin
if iso_connect_as == 'usb':
admin.disk_devices.get(device='disk',
bus='usb').volume.upload(settings.ISO_PATH)
else: # cdrom is default
admin.disk_devices.get(
device='cdrom').volume.upload(settings.ISO_PATH)
self.d_env.start([admin]) self.d_env.start([admin])
logger.info("Waiting for admin node to start up") logger.info("Waiting for admin node to start up")
wait(lambda: admin.driver.node_active(admin), 60) wait(lambda: admin.driver.node_active(admin), 60)
logger.info("Proceed with installation") logger.info("Proceed with installation")