openstack/fuel-qa
Code Issues Proposed changes

Merge "Add reset of admin node after hang" into stable/mitaka

Browse Source
This commit is contained in:
Jenkins 2016-11-07 12:03:36 +00:00 committed by Gerrit Code Review
commit 8877c76234
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fuelweb_test/models/environment.py
View File

@ -405,18 +405,29 @@ class EnvironmentModel(six.with_metaclass(SingletonMeta, object)):
admin = self.d_env.nodes().admin admin = self.d_env.nodes().admin
self.d_env.start([admin]) self.d_env.start([admin])
logger.info("Waiting for admin node to start up") def provision_admin(admin_node):
wait(lambda: admin.driver.node_active(admin), 60, logger.info("Waiting for admin node to start up")
timeout_msg='Admin node startup timeout') wait(lambda: admin.driver.node_active(admin_node), 60,
logger.info("Proceed with installation") timeout_msg='Admin node startup timeout')
# update network parameters at boot screen logger.info("Proceed with installation")
admin.send_keys(self.get_keys(admin, custom=custom, # update network parameters at boot screen
build_images=build_images, admin_node.send_keys(self.get_keys(
iso_connect_as=iso_connect_as)) admin_node,
if settings.SHOW_FUELMENU: custom=custom,
self.wait_for_fuelmenu() build_images=build_images,
else: iso_connect_as=iso_connect_as))
self.wait_for_provisioning() if settings.SHOW_FUELMENU:
self.wait_for_fuelmenu()
else:
self.wait_for_provisioning()
try:
provision_admin(admin)
except Exception as e:
logger.info('Master node restart: LP1587411')
logger.info('Exception is: {e}'.format(e=e))
admin.reset()
provision_admin(admin)
self.set_admin_ssh_password() self.set_admin_ssh_password()