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 38f3f55daa39d7a7bb21b528f1a0e291e4ffb87f..d530f263f1bbbada06bb3dccd845ba37a9008572 100644 (file)
--- 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(