From: Warren Usui Date: Wed, 3 Dec 2014 17:16:02 +0000 (-0800) Subject: Added calamari-server X-Git-Tag: 1.1.0~1061^2~21^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F372%2Fhead;p=teuthology.git Added calamari-server Calamari-server has been added to the list of installed packages to be removed. Also added salt-common and salt-minion to the list of rpms to be removed. Fixes #10034 Signed-off-by: Warren Usui --- diff --git a/teuthology/nuke.py b/teuthology/nuke.py index db1d5b67..c0416625 100644 --- a/teuthology/nuke.py +++ b/teuthology/nuke.py @@ -255,8 +255,8 @@ def remove_installed_packages(ctx): install_task.remove_packages( ctx, config, - {"deb": install_task.deb_packages['ceph'] + ['salt-common', 'salt-minion'], - "rpm": install_task.rpm_packages['ceph']}) + {"deb": install_task.deb_packages['ceph'] + ['salt-common', 'salt-minion', 'calamari-server'], + "rpm": install_task.rpm_packages['ceph'] + ['salt-common', 'salt-minion', 'calamari-server']}) install_task.remove_sources(ctx, config) install_task.purge_data(ctx)