]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Changes so these are not installed and still removed
authorGregory Meno <gregory.meno@inktank.com>
Tue, 29 Apr 2014 17:44:27 +0000 (10:44 -0700)
committerZack Cerza <zack@cerza.org>
Tue, 29 Apr 2014 20:18:42 +0000 (15:18 -0500)
teuthology/nuke.py
teuthology/task/install.py

index 541f934b9482fdb1dcd0603e7ef4b45c5bee67af..c971cbd1d4fb2c1ad7c7214fe0517884a1caaa49 100644 (file)
@@ -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)
index 00b06ceb08051f4b6605b027a2f0005780bdd877..5c2dd49d3af8a1f483414eb61bf8b33c5dc48e66 100644 (file)
@@ -732,8 +732,6 @@ deb_packages = {'ceph': [
     'python-ceph',
     'libcephfs1',
     'libcephfs1-dbg',
-    'salt-common',
-    'salt-minion',
 ]}
 
 rpm_packages = {'ceph': [