From: Zack Cerza <zack@redhat.com>
Date: Tue, 8 Mar 2016 22:29:00 +0000 (-0700)
Subject: nuke: Use install_task.get_package_list()
X-Git-Tag: 1.1.0~651^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=207c36c15aeff4a9c918fa567587103fbebb6c83;p=teuthology.git

nuke: Use install_task.get_package_list()

(Properly named task.install.get_package_list())

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index ca5e6a505..c6e47b3e9 100644
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -285,14 +285,23 @@ def remove_yum_timedhosts(ctx):
 
 def remove_installed_packages(ctx):
     dpkg_configure(ctx)
-    conf = {'project': 'ceph'}
+    conf = dict(
+        project='ceph',
+        debuginfo='true',
+    )
+    packages = install_task.get_package_list(ctx, conf)
+    debs = packages['deb'] + \
+        ['salt-common', 'salt-minion', 'calamari-server', 'python-rados']
+    rpms = packages['rpm'] + \
+        ['salt-common', 'salt-minion', 'calamari-server']
     install_task.remove_packages(
         ctx,
         conf,
-        {"deb": install_task.PACKAGES['ceph']['deb'] +
-         ['salt-common', 'salt-minion', 'calamari-server', 'python-rados'],
-         "rpm": install_task.PACKAGES['ceph']['rpm'] +
-         ['salt-common', 'salt-minion', 'calamari-server']})
+        dict(
+            deb=debs,
+            rpm=rpms,
+        )
+    )
     install_task.remove_sources(ctx, conf)
     install_task.purge_data(ctx)