From: Gregory Meno <gregory.meno@inktank.com>
Date: Mon, 14 Apr 2014 11:21:57 +0000 (-0700)
Subject: These will likely go somewhere better before merge
X-Git-Tag: v0.94.10~27^2^2~364^2~225
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d71a87452f6450ba5d749630ee4ba476bce543c7;p=ceph.git

These will likely go somewhere better before merge
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 1fca0d3c672..00b06ceb080 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -713,6 +713,8 @@ def remove_sources(ctx, config):
             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')
 
 deb_packages = {'ceph': [
     'ceph',
@@ -730,6 +732,8 @@ deb_packages = {'ceph': [
     'python-ceph',
     'libcephfs1',
     'libcephfs1-dbg',
+    'salt-common',
+    'salt-minion',
 ]}
 
 rpm_packages = {'ceph': [