From 021f84ac64f076cb521bd4e0861bbaab7e0dee69 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 11 Feb 2014 13:52:23 -0600 Subject: [PATCH] Simplify create_if_vm's downburst config logic Signed-off-by: Zack Cerza --- teuthology/lock.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/teuthology/lock.py b/teuthology/lock.py index ada71a7a8b632..77b83f9b24d16 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -452,15 +452,9 @@ def create_if_vm(ctx, machine_name): if lcnfg.keys() == ['downburst']: lcnfg = lcnfg['downburst'] except (TypeError, AttributeError): - try: - lcnfg = {} - for tdict in ctx.config['downburst']: - for key in tdict: - lcnfg[key] = tdict[key] - except (KeyError, AttributeError): - lcnfg = {} + lcnfg = ctx.config.get('downburst', dict()) except IOError: - print "Error reading %s" % lfile + print "Error reading %s" % lfile return False distro = lcnfg.get('distro', os_type.lower()) -- 2.39.5