From: Zack Cerza <zack@cerza.org>
Date: Thu, 22 Aug 2013 14:49:53 +0000 (-0500)
Subject: Fix upgrading edge-ish case
X-Git-Tag: 1.1.0~1951^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45%2Fhead;p=teuthology.git

Fix upgrading edge-ish case
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index f1f5a32d1..bc01705ed 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -810,6 +810,7 @@ def upgrade(ctx, config):
                 _upgrade_deb_packages(ctx, config, remote, pkgs, branch)
             elif system_type == 'rpm':
                 _upgrade_rpm_packages(ctx, config, remote, pkgs, branch)
+    # FIXME: I highly doubt if this needs to be a separate codepath.
     else:
         list_roles = []
         for role in config.keys():
@@ -824,7 +825,10 @@ def upgrade(ctx, config):
                         system_type = teuthology.get_system_type(remote)
                         assert system_type in ('deb', 'rpm')
                         pkgs = PACKAGES[project][system_type]
-                        _upgrade_deb_packages(ctx, config, remote, pkgs, branch)
+                        if system_type == 'deb':
+                            _upgrade_deb_packages(ctx, config, remote, pkgs, branch)
+                        elif system_type == 'rpm':
+                            _upgrade_rpm_packages(ctx, config, remote, pkgs, branch)
                         list_roles.append(remote)
     yield