Fix upgrading edge-ish case

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index f1f5a32d1e176b2d2b1361540fd5174183ec99c8..bc01705edccf8021e21e83aacaf115ac9ebf1fb7 100644 (file)
--- 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