These will likely go somewhere better before merge

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 1fca0d3c6724ea1ab2afb561851a9f6de40ba678..00b06ceb08051f4b6605b027a2f0005780bdd877 100644 (file)
--- 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': [