RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

run: clean up machine_type thing

Browse Source 
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-03-29 12:16:39 -07:00
parent e8afa454d8
commit 9f46f47b6b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
teuthology/run.py
View File

@ -103,9 +103,8 @@ def main():
machine_type = ctx.machine_type
if machine_type is None:
machine_type = ctx.config.get('machine-type')
if machine_type is None:
machine_type = ctx.config.get('machine_type', 'plana')
fallback_default = ctx.config.get('machine_type', 'plana')
machine_type = ctx.config.get('machine-type', fallback_default)
if ctx.block:
assert ctx.lock, \