From: Zack Cerza <zack@cerza.org>
Date: Tue, 11 Feb 2014 19:52:23 +0000 (-0600)
Subject: Simplify create_if_vm's downburst config logic
X-Git-Tag: v0.94.10~27^2^2~364^2~356^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=021f84ac64f076cb521bd4e0861bbaab7e0dee69;p=ceph.git

Simplify create_if_vm's downburst config logic

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index ada71a7a8b63..77b83f9b24d1 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())