From 5339c1f2ee3640cbcb1d807579bf8cbd7b918351 Mon Sep 17 00:00:00 2001 From: Gregory Meno Date: Tue, 29 Apr 2014 10:44:27 -0700 Subject: [PATCH] Changes so these are not installed and still removed --- teuthology/nuke.py | 2 +- teuthology/task/install.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/teuthology/nuke.py b/teuthology/nuke.py index 541f934b9..c971cbd1d 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 00b06ceb0..5c2dd49d3 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': [ -- 2.47.3