From dcf99e43b9e130c5801243e570a2b4009a40e215 Mon Sep 17 00:00:00 2001 From: Sam Lang Date: Fri, 1 Feb 2013 08:24:41 -0600 Subject: [PATCH] nuke: Optionally check console status Only check the ipmi console status if the ipmi parameters have been defined in .teuthology.yaml. Signed-off-by: Sam Lang --- teuthology/nuke.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/teuthology/nuke.py b/teuthology/nuke.py index b20067b1b840a..78d699126afc6 100644 --- a/teuthology/nuke.py +++ b/teuthology/nuke.py @@ -362,21 +362,22 @@ def nuke_helper(ctx, log): host = target.split('@')[-1] shortname = host.split('.')[0] log.debug('shortname: %s' % shortname) - console = remote.RemoteConsole(name=host, - ipmiuser=ctx.teuthology_config['ipmi_user'], - ipmipass=ctx.teuthology_config['ipmi_password'], - ipmidomain=ctx.teuthology_config['ipmi_domain']) - cname = '{host}.{domain}'.format(host=shortname, domain=ctx.teuthology_config['ipmi_domain']) - log.info('checking console status of %s' % cname) - if not console.check_status(): - # not powered on or can't get IPMI status. Try to power on - console.power_on() - # try to get status again, waiting for login prompt this time - if not console.check_status(100): - log.error('Failed to get console status for %s, disabling console...' % cname) - log.info('console ready on %s' % cname) - else: - log.info('console ready on %s' % cname) + if 'ipmi_user' in ctx.teuthology_config: + console = remote.RemoteConsole(name=host, + ipmiuser=ctx.teuthology_config['ipmi_user'], + ipmipass=ctx.teuthology_config['ipmi_password'], + ipmidomain=ctx.teuthology_config['ipmi_domain']) + cname = '{host}.{domain}'.format(host=shortname, domain=ctx.teuthology_config['ipmi_domain']) + log.info('checking console status of %s' % cname) + if not console.check_status(): + # not powered on or can't get IPMI status. Try to power on + console.power_on() + # try to get status again, waiting for login prompt this time + if not console.check_status(100): + log.error('Failed to get console status for %s, disabling console...' % cname) + log.info('console ready on %s' % cname) + else: + log.info('console ready on %s' % cname) from teuthology.task.internal import check_lock, connect if ctx.check_locks: -- 2.39.5