From: Dan Mick <dan.mick@inktank.com>
Date: Fri, 31 Jan 2014 07:47:03 +0000 (-0800)
Subject: install.py: look for 'local' in config directly, don't warn if not found
X-Git-Tag: 1.1.0~1679^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F180%2Fhead;p=teuthology.git

install.py: look for 'local' in config directly, don't warn if not found

Fixes: #7278
Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index ab0774f0c..eaf8de9d5 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -248,19 +248,12 @@ def _block_looking_for_package_version(remote, base_url, wait=False):
     version = r.stdout.getvalue().strip()
     return version
 
-def _get_local_dir(ctx, remote):
+def _get_local_dir(config, remote):
     """
-    Extract local directory name from the task lists. 
+    Extract local directory name from the task lists.
     Copy files over to the remote site.
     """
-    ldir = None
-    for tsk in ctx.config['tasks']:
-        if 'install' in tsk:
-            try:
-                ldir = tsk['install']['local']
-                break
-            except (TypeError, KeyError):
-                log.info("Attempted to install invalid local file")
+    ldir = config.get('local', None)
     if ldir:
         remote.run(args=['sudo', 'mkdir', '-p', ldir,])
         for fyle in os.listdir(ldir):
@@ -349,7 +342,7 @@ def _update_deb_package_list_and_install(ctx, remote, debs, config):
         ] + ['%s=%s' % (d, version) for d in debs],
         stdout=StringIO(),
     )
-    ldir = _get_local_dir(ctx, remote)
+    ldir = _get_local_dir(config, remote)
     if ldir:
         for fyle in os.listdir(ldir):
             fname = "%s/%s" % (ldir, fyle)
@@ -446,7 +439,7 @@ def _update_rpm_package_list_and_install(ctx, remote, rpm, config):
     tmp_vers = version_no.getvalue().strip()[1:]
     if '-' in tmp_vers:
         tmp_vers = tmp_vers.split('-')[0]
-    ldir = _get_local_dir(ctx, remote)
+    ldir = _get_local_dir(config, remote)
     for cpack in rpm:
         pk_err_mess = StringIO()
         pkg2add = "{cpack}-{version}".format(cpack=cpack, version=tmp_vers)