From: Zack Cerza <zack@cerza.org>
Date: Mon, 9 Dec 2013 21:16:33 +0000 (-0800)
Subject: Merge pull request #151 from ceph/wip-distro-kernel
X-Git-Tag: v0.94.10~27^2^2~364^2~465
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d6feb4b609b1ec3ab5e4ced141bd4d76c97eac9;p=ceph.git

Merge pull request #151 from ceph/wip-distro-kernel

Wip distro kernel
---

3d6feb4b609b1ec3ab5e4ced141bd4d76c97eac9
diff --cc teuthology/run.py
index e96a9df26137,308b9a8c62ec..6cfbf57c8fb2
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@@ -135,15 -135,13 +135,16 @@@ def main(ctx)
          {'internal.check_lock': None},
          {'internal.connect': None},
          {'internal.check_conflict': None},
 -        {'internal.check_ceph_data': None},
 -        {'internal.vm_setup': None},
      ])
 +    if not ctx.config.get('use_existing_cluster', False):
 +        init_tasks.extend([
 +            {'internal.check_ceph_data': None},
 +            {'internal.vm_setup': None},
 +        ])
      if 'kernel' in ctx.config:
+         sha1 = ctx.config['kernel'].get('sha1')
          distro = get_distro(ctx)
-         if distro == 'ubuntu':
+         if (distro == 'ubuntu') or (sha1 == 'distro'):
              init_tasks.append({'kernel': ctx.config['kernel']})
      init_tasks.extend([
          {'internal.base': None},
diff --cc teuthology/task/kernel.py
index 9d318055bde7,67a461e0c20c..cf6fc937218b
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@@ -218,15 -186,15 +221,21 @@@ def install_firmware(ctx, config)
              )
  
  def download_deb(ctx, config):
 +    """
 +    Download a Debian kernel and copy the assocated linux image.
 +
 +    :param ctx: Context
 +    :param config: Configuration
 +    """
      procs = {}
+     #Don't need to download distro kernels
      for role, src in config.iteritems():
          (role_remote,) = ctx.cluster.only(role).remotes.keys()
+ 	if src.find('distro') >= 0:
+             log.info('Installing newest kernel distro');
+             return
+             
+ 
          if src.find('/') >= 0:
              # local deb
              log.info('Copying kernel deb {path} to {role}...'.format(path=src,