From: Gregory Meno <gregory.meno@inktank.com>
Date: Tue, 29 Apr 2014 17:44:27 +0000 (-0700)
Subject: Changes so these are not installed and still removed
X-Git-Tag: v0.94.10~27^2^2~364^2~222
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5339c1f2ee3640cbcb1d807579bf8cbd7b918351;p=ceph.git

Changes so these are not installed and still removed
---

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 541f934b9482..c971cbd1d4fb 100644
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -225,7 +225,7 @@ def remove_installed_packages(ctx):
     install_task.remove_packages(
         ctx,
         config,
-        {"deb": install_task.deb_packages['ceph'],
+        {"deb": install_task.deb_packages['ceph'] + ['salt-common', 'salt-minion'],
          "rpm": install_task.rpm_packages['ceph']})
     install_task.remove_sources(ctx, config)
     install_task.purge_data(ctx)
diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 00b06ceb0805..5c2dd49d3af8 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -732,8 +732,6 @@ deb_packages = {'ceph': [
     'python-ceph',
     'libcephfs1',
     'libcephfs1-dbg',
-    'salt-common',
-    'salt-minion',
 ]}
 
 rpm_packages = {'ceph': [