From: Zack Cerza <zack@redhat.com>
Date: Tue, 10 Feb 2015 22:32:56 +0000 (-0700)
Subject: Don't run two apt-get updates in parallel
X-Git-Tag: 1.1.0~1011^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d56e7bffd8d6fe8fd0b9e9e315b4fcc11a263830;p=teuthology.git

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 1b7bdbd2f..b07491cd0 100644
--- 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):