]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
kernel: fix sha1
authorSage Weil <sage@inktank.com>
Sat, 17 Aug 2013 05:34:26 +0000 (22:34 -0700)
committerSage Weil <sage@inktank.com>
Sat, 17 Aug 2013 05:34:26 +0000 (22:34 -0700)
6f8910eca47c3d00643c77fb8a166357637e55eb inadvertantly started
using the ceph sha1 for the kernel.

Signed-off-by: Sage Weil <sage@inktank.com>
teuthology/task/kernel.py

index cff01ae093bca190a3ef3edb60e2aa9d6123f682..a5ef4ae748947e88e55ae4d119d8ddedd920d905 100644 (file)
@@ -511,13 +511,12 @@ def task(ctx, config):
                 log.info('unable to extract sha1 from deb path, forcing install')
                 assert False
         else:
-            nsha1 = ctx.config.get('overrides',{}).get('ceph',{}).get('sha1',role_config.get('sha1'))
             larch, ldist = _find_arch_and_dist(ctx)
             sha1, _ = teuthology.get_ceph_binary_url(
                 package='kernel',
                 branch=role_config.get('branch'),
                 tag=role_config.get('tag'),
-                sha1=nsha1,
+                sha1=role_config.get('sha1'),
                 flavor='basic',
                 format='deb',
                 dist=ldist,