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 <zack@redhat.com>

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 98493664cf28ae92a257c6ee7c12aadc14942996..7fe64e4b8d47dfb7248f46ec1c81ddff406dc705 100644 (file)
--- 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 8e8a7ae8bd59f2be50e4b7d25bb6d936ef97d04d..53c4f3dd39934f3e6b024644c829eb30c559cac8 100644 (file)
--- 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',