]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Merge branch 'wip-teuth4768a-wusui'
authorWarren Usui <warren.usui@inktank.com>
Wed, 8 May 2013 02:27:51 +0000 (19:27 -0700)
committerWarren Usui <warren.usui@inktank.com>
Wed, 8 May 2013 02:27:51 +0000 (19:27 -0700)
Conflicts:
teuthology/task/install.py

1  2 
teuthology/task/install.py

index 979484f5260bc519b033d37ecb1a9fc47cfcf7ab,38f9a8831e456573f3980750f55368564b6c81dd..1125d45a5c5dc192da6a2e718bf6664a534306ed
@@@ -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',