From: Sandon Van Ness <sandon@inktank.com>
Date: Fri, 26 Jul 2013 23:15:19 +0000 (-0700)
Subject: Allow OS version over-ride (distro version)
X-Git-Tag: 1.1.0~2034
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c01c200f15a01e0293ba62f4d926a4e35f9b50f1;p=teuthology.git

Allow OS version over-ride (distro version)

Read os_version from yaml to over-ride teuthology defaults.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 38f3f55daa..d530f263f1 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -545,7 +545,7 @@ def create_if_vm(ctx, machine_name):
         return False
     from teuthology.misc import get_distro
     os_type = get_distro(ctx)
-    os_version = dict(
+    default_os_version = dict(
         ubuntu="12.04",
         fedora="18",
         centos="6.4",
@@ -569,7 +569,7 @@ def create_if_vm(ctx, machine_name):
         file_info['networks'] = lcnfg.get('networks',
                 [{'source' : 'front', 'mac' : status_info['mac']}])
         file_info['distro'] = distro
-        file_info['distroversion'] = os_version[distro]
+        file_info['distroversion'] = ctx.config.get('os_version', default_os_version[distro])
         file_info['additional-disks'] = lcnfg.get(
                 'additional-disks', 3)
         file_info['additional-disks-size'] = lcnfg.get(