]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Remove unused variables and functions.
authorSandon Van Ness <sandon@inktank.com>
Thu, 5 Jun 2014 19:04:49 +0000 (12:04 -0700)
committerSandon Van Ness <sandon@inktank.com>
Mon, 23 Jun 2014 21:35:31 +0000 (14:35 -0700)
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
teuthology/run.py
teuthology/task/kernel.py

index 1977f6f256d0872bf4929d055bffbdc648ce3bc6..eba7fb3dcfd87fc0357d0c3449d1ffabd1f5e58b 100644 (file)
@@ -143,8 +143,6 @@ def main(ctx):
             {'internal.vm_setup': None},
         ])
     if 'kernel' in ctx.config:
-        sha1 = ctx.config['kernel'].get('sha1')
-        distro = get_distro(ctx)
         init_tasks.append({'kernel': ctx.config['kernel']})
     init_tasks.extend([
         {'internal.base': None},
index a7b178f1faafe56707cf7b0567e591ae7cfa7888..2f2ea6fe9ea4d991b4e40438443ac8ed957ba269 100644 (file)
@@ -290,8 +290,6 @@ def download_kernel(ctx, config):
                 err_mess.close()
                 proc = role_remote.run(args=['sudo', 'yum', 'install', '-y', kernel_url], wait=False)
                 procs[role_remote.name] = proc
-
-                #download_rpm_kernel(role_remote, kernel_url, src)
                 continue
 
             larch, ldist = _find_arch_and_dist(ctx)
@@ -613,16 +611,6 @@ def need_to_install_distro(ctx, role):
     return True
 
 
-def download_rpm_kernel(remote, url, sha1):
-    """
-    Install RPM kernel from URL.
-    """
-    output, err_mess = StringIO(), StringIO()
-    remote.run(args=['sudo', 'yum', 'list', 'installed', 'kernel'], stdout=output, stderr=err_mess )
-    if sha1[0:7] in output.getvalue():
-        return
-    remote.run(args=['sudo', 'yum', 'install', '-y', url], stdout=output, stderr=err_mess )
-
 def install_kernel(remote, sha1=None):
     """
     RPM: Find newest kernel on the machine and update grub to use kernel + reboot.