Remove duplicate package list from install task

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

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index c49f9204fcc69f87a680577a7cec3192d3bffbde..e36798c50242e6dcfda6f784af6328aca463d907 100644 (file)
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -258,9 +258,9 @@ def remove_installed_packages(ctx):
     install_task.remove_packages(
         ctx,
         conf,
-        {"deb": install_task.deb_packages['ceph'] +
+        {"deb": install_task.PACKAGES['ceph']['deb'] +
          ['salt-common', 'salt-minion', 'calamari-server'],
-         "rpm": install_task.rpm_packages['ceph'] +
+         "rpm": install_task.PACKAGES['ceph']['rpm'] +
          ['salt-common', 'salt-minion', 'calamari-server']})
     install_task.remove_sources(ctx, conf)
     install_task.purge_data(ctx)

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 97d3db5a801b29014620e790bbf66e84bd406869..fb415465178d01d72c6dec2e0c5be9b76fd34115 100644 (file)
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -61,42 +61,6 @@ PACKAGES['ceph']['rpm'] = [
     'python-ceph',
 ]
 
-deb_packages = {'ceph': [
-    'ceph',
-    'ceph-dbg',
-    'ceph-mds',
-    'ceph-mds-dbg',
-    'ceph-common',
-    'ceph-common-dbg',
-    'ceph-fuse',
-    'ceph-fuse-dbg',
-    'ceph-test',
-    'ceph-test-dbg',
-    'radosgw',
-    'radosgw-dbg',
-    'python-ceph',
-    'libcephfs1',
-    'libcephfs1-dbg',
-    'libcephfs-java',
-    'librados2',
-    'librbd1',
-]}
-
-rpm_packages = {'ceph': [
-    'ceph-debuginfo',
-    'ceph-radosgw',
-    'ceph-test',
-    'ceph-devel',
-    'ceph',
-    'ceph-fuse',
-    'rest-bench',
-    'libcephfs_jni1',
-    'libcephfs1',
-    'librados2',
-    'librbd1',
-    'python-ceph',
-]}
-
 def _run_and_log_error_if_fails(remote, args):
     """
     Yet another wrapper around command execution. This one runs a command on
@@ -776,10 +740,9 @@ def install(ctx, config):
 
     project = config.get('project', 'ceph')
 
-    global deb_packages
-    global rpm_packages
-    debs = deb_packages.get(project, [])
-    rpm = rpm_packages.get(project, [])
+    global PACKAGES
+    debs = PACKAGES[project]['deb']
+    rpm = PACKAGES[project]['rpm']
 
     # pull any additional packages out of config
     extra_pkgs = config.get('extra_packages')