Don't run two apt-get updates in parallel

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 1b7bdbd2fe446cd39cc0d1e60de43169c72bcaab..b07491cd0a70dedb1fa97480595855e1c5fbd0a5 100644 (file)
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -721,15 +721,22 @@ def remove_sources(ctx, config):
         'deb': _remove_sources_list_deb,
         'rpm': _remove_sources_list_rpm,
     }
-    log.info("Removing {proj} sources lists".format(
-        proj=config.get('project', 'ceph')))
     with parallel() as p:
+        project = config.get('project', 'ceph')
+        log.info("Removing {proj} sources lists".format(
+            proj=project))
         for remote in ctx.cluster.remotes.iterkeys():
-            system_type = teuthology.get_system_type(remote)
-            p.spawn(remove_sources_pkgs[
-                    system_type], remote, config.get('project', 'ceph'))
-            p.spawn(remove_sources_pkgs[
-                    system_type], remote, 'calamari')
+            remove_fn = remove_sources_pkgs[remote.os.package_type]
+            p.spawn(remove_fn, remote, project)
+
+    with parallel() as p:
+        project = 'calamari'
+        log.info("Removing {proj} sources lists".format(
+            proj=project))
+        for remote in ctx.cluster.remotes.iterkeys():
+            remove_fn = remove_sources_pkgs[remote.os.package_type]
+            p.spawn(remove_fn, remote, project)
+
 
 @contextlib.contextmanager
 def install(ctx, config):