From: Warren Usui <warren.usui@inktank.com>
Date: Wed, 8 May 2013 02:27:51 +0000 (-0700)
Subject: Merge branch 'wip-teuth4768a-wusui'
X-Git-Tag: 1.1.0~2156
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f1dfcba5ee95e618b523c0c0103feee9e0906e29;p=teuthology.git

Merge branch 'wip-teuth4768a-wusui'

Conflicts:
	teuthology/task/install.py
---

f1dfcba5ee95e618b523c0c0103feee9e0906e29
diff --cc teuthology/task/install.py
index 979484f526,38f9a8831e..1125d45a5c
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@@ -262,8 -305,12 +306,12 @@@ def _remove_rpm(config, remote, rpm)
              run.Raw(';'),
              'done',
              ])
-     projRelease = '%s-release-%s.el6.noarch' % (config.get('project'), RELEASE)
+     remote.run(
+         args=[
+             'sudo', 'yum', 'clean', 'all',
+             ])
 -    cephRelease = 'ceph-release-%s.el6.noarch' % RELEASE
 -    remote.run(args=['sudo', 'yum', 'erase', cephRelease, '-y'])
++    projRelease = '%s-release-%s.el6.noarch' % (config.get('project','ceph'), RELEASE)
 +    remote.run(args=['sudo', 'yum', 'erase', projRelease, '-y'])
      remote.run(
          args=[
              'sudo', 'yum', 'clean', 'expire-cache',