From 3f4a9dc763292a8e792fd5d9739376208f2d3dc5 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 9 Jun 2015 13:55:18 -0600 Subject: [PATCH] Move python-rados out of install and into nuke Not all ceph branches contain python-rados; the original motivation for mentioning it in the install task's package list was so that nuke would remove it. There is another way, though, that doesn't affect the install task's behavior at all (this is the way). Signed-off-by: Zack Cerza --- teuthology/nuke.py | 2 +- teuthology/task/install.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/teuthology/nuke.py b/teuthology/nuke.py index 98493664cf..7fe64e4b8d 100644 --- a/teuthology/nuke.py +++ b/teuthology/nuke.py @@ -268,7 +268,7 @@ def remove_installed_packages(ctx): ctx, conf, {"deb": install_task.PACKAGES['ceph']['deb'] + - ['salt-common', 'salt-minion', 'calamari-server'], + ['salt-common', 'salt-minion', 'calamari-server', 'python-rados'], "rpm": install_task.PACKAGES['ceph']['rpm'] + ['salt-common', 'salt-minion', 'calamari-server']}) install_task.remove_sources(ctx, conf) diff --git a/teuthology/task/install.py b/teuthology/task/install.py index 8e8a7ae8bd..53c4f3dd39 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -38,7 +38,6 @@ PACKAGES['ceph']['deb'] = [ 'radosgw', 'radosgw-dbg', 'python-ceph', - 'python-rados', 'libcephfs1', 'libcephfs1-dbg', 'libcephfs-java', -- 2.39.5