[plugins] Fix incorrect tuples in plugin attributes

Fixes a number of plugins whose enablement attributes (profiles,
packages, commands, files) were incorrectly formatted and not actual
tuples.

Related: #2549

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

26 files changed, 32 insertions, 42 deletions

diff --git a/sos/report/plugins/cifs.py b/sos/report/plugins/cifs.py
index 85dbe9b5..c0932332 100644
--- a/sos/report/plugins/cifs.py
+++ b/sos/report/plugins/cifs.py
@@ -14,7 +14,7 @@ class Cifs(Plugin, IndependentPlugin):
     short_desc = 'SMB file system information'
     plugin_name = 'cifs'
     profiles = ('storage', 'network', 'cifs')
-    packages = ['cifs-utils']
+    packages = ('cifs-utils',)
 
     def setup(self):
         self.add_copy_spec([
diff --git a/sos/report/plugins/cman.py b/sos/report/plugins/cman.py
index 268f14c5..10ba2a98 100644
--- a/sos/report/plugins/cman.py
+++ b/sos/report/plugins/cman.py
@@ -17,13 +17,9 @@ class Cman(Plugin, RedHatPlugin):
     plugin_name = "cman"
     profiles = ("cluster",)
 
-    packages = [
-        "luci",
-        "cman",
-        "clusterlib",
-    ]
+    packages = ("luci", "cman", "clusterlib")
 
-    files = ["/etc/cluster/cluster.conf"]
+    files = ("/etc/cluster/cluster.conf",)
 
     debugfs_path = "/sys/kernel/debug"
     _debugfs_cleanup = False
diff --git a/sos/report/plugins/collectd.py b/sos/report/plugins/collectd.py
index d639fdf4..80d4b00a 100644
--- a/sos/report/plugins/collectd.py
+++ b/sos/report/plugins/collectd.py
@@ -21,7 +21,7 @@ class Collectd(Plugin, IndependentPlugin):
     # or being inside Super Proviledged Container that does not have
     # the package but logs to the host's logfile
     packages = ('collectd',)
-    files = ('/var/log/containers/collectd/collectd.log')
+    files = ('/var/log/containers/collectd/collectd.log',)
 
     def setup(self):
         self.add_copy_spec([
diff --git a/sos/report/plugins/cron.py b/sos/report/plugins/cron.py
index 5853855f..ad2f175d 100644
--- a/sos/report/plugins/cron.py
+++ b/sos/report/plugins/cron.py
@@ -17,7 +17,7 @@ class Cron(Plugin, IndependentPlugin):
     profiles = ('system',)
     packages = ('cron', 'anacron', 'chronie')
 
-    files = ('/etc/crontab')
+    files = ('/etc/crontab',)
 
     def setup(self):
         self.add_copy_spec([
diff --git a/sos/report/plugins/distupgrade.py b/sos/report/plugins/distupgrade.py
index a2edb954..c346d367 100644
--- a/sos/report/plugins/distupgrade.py
+++ b/sos/report/plugins/distupgrade.py
@@ -18,8 +18,6 @@ class DistUpgrade(Plugin):
     plugin_name = "distupgrade"
     profiles = ('system', 'sysmgmt')
 
-    files = None
-
 
 class RedHatDistUpgrade(DistUpgrade, RedHatPlugin):
 
diff --git a/sos/report/plugins/dlm.py b/sos/report/plugins/dlm.py
index 6b979cc0..8f8e08b0 100644
--- a/sos/report/plugins/dlm.py
+++ b/sos/report/plugins/dlm.py
@@ -16,7 +16,7 @@ class Dlm(Plugin, IndependentPlugin):
 
     plugin_name = "dlm"
     profiles = ("cluster", )
-    packages = ["cman", "dlm", "pacemaker"]
+    packages = ("cman", "dlm", "pacemaker")
     option_list = [
         ("lockdump", "capture lock dumps for DLM", "slow", False),
     ]
diff --git a/sos/report/plugins/drbd.py b/sos/report/plugins/drbd.py
index bcdc763c..0293f43a 100644
--- a/sos/report/plugins/drbd.py
+++ b/sos/report/plugins/drbd.py
@@ -14,7 +14,7 @@ class drbd(Plugin, RedHatPlugin, UbuntuPlugin):
     short_desc = 'Distributed Replicated Block Device (DRBD)'
 
     plugin_name = 'drbd'
-    profiles = ('storage')
+    profiles = ('storage',)
     packages = ('drbd*-utils',)
 
     def setup(self):
diff --git a/sos/report/plugins/gfs2.py b/sos/report/plugins/gfs2.py
index 79b1bd44..cce6198c 100644
--- a/sos/report/plugins/gfs2.py
+++ b/sos/report/plugins/gfs2.py
@@ -15,7 +15,7 @@ class Gfs2(Plugin, IndependentPlugin):
 
     plugin_name = "gfs2"
     profiles = ("cluster", )
-    packages = ["gfs2-utils"]
+    packages = ("gfs2-utils",)
 
     option_list = [
         ("lockdump",
diff --git a/sos/report/plugins/gluster.py b/sos/report/plugins/gluster.py
index 952cab63..573a5f3b 100644
--- a/sos/report/plugins/gluster.py
+++ b/sos/report/plugins/gluster.py
@@ -22,8 +22,8 @@ class Gluster(Plugin, RedHatPlugin):
     profiles = ('storage', 'virt')
 
     statedump_dir = '/run/gluster'
-    packages = ["glusterfs", "glusterfs-core"]
-    files = ["/etc/glusterd", "/var/lib/glusterd"]
+    packages = ("glusterfs", "glusterfs-core")
+    files = ("/etc/glusterd", "/var/lib/glusterd")
 
     option_list = [("dump", "enable glusterdump support", "slow", False)]
 
diff --git a/sos/report/plugins/grafana.py b/sos/report/plugins/grafana.py
index 8a0f3acd..f58f1871 100644
--- a/sos/report/plugins/grafana.py
+++ b/sos/report/plugins/grafana.py
@@ -17,7 +17,7 @@ class Grafana(Plugin, IndependentPlugin):
     plugin_name = "grafana"
     profiles = ('services', 'openstack', 'openstack_controller')
 
-    packages = ('grafana')
+    packages = ('grafana',)
 
     def setup(self):
         if self.get_option("all_logs"):
diff --git a/sos/report/plugins/insights.py b/sos/report/plugins/insights.py
index 50aa007c..d242bba6 100644
--- a/sos/report/plugins/insights.py
+++ b/sos/report/plugins/insights.py
@@ -13,7 +13,7 @@ class RedHatInsights(Plugin, RedHatPlugin):
 
     short_desc = 'Collect config and logs for Red Hat Insights'
     plugin_name = 'insights'
-    packages = ['redhat-access-insights', 'insights-client']
+    packages = ('redhat-access-insights', 'insights-client')
     profiles = ('system', 'sysmgmt')
     config = (
         '/etc/insights-client/insights-client.conf',
diff --git a/sos/report/plugins/juju.py b/sos/report/plugins/juju.py
index 0db3ea10..755f4875 100644
--- a/sos/report/plugins/juju.py
+++ b/sos/report/plugins/juju.py
@@ -20,7 +20,7 @@ class Juju(Plugin, UbuntuPlugin):
 
     # Using files instead of packages here because there is no identifying
     # package on a juju machine.
-    files = ('/var/log/juju')
+    files = ('/var/log/juju',)
 
     def setup(self):
         # Juju service names are not consistent through deployments,
diff --git a/sos/report/plugins/named.py b/sos/report/plugins/named.py
index 1f5ad3fb..51a17498 100644
--- a/sos/report/plugins/named.py
+++ b/sos/report/plugins/named.py
@@ -70,7 +70,7 @@ class RedHatNamed(Named, RedHatPlugin):
 
 class DebianNamed(Named, DebianPlugin, UbuntuPlugin):
 
-    files = ('/etc/bind/named.conf')
+    files = ('/etc/bind/named.conf',)
     packages = ('bind9',)
     named_conf = "/etc/bind/named.conf"
     config_files = (named_conf,
diff --git a/sos/report/plugins/omnipath_client.py b/sos/report/plugins/omnipath_client.py
index 12e470c9..1ec01384 100644
--- a/sos/report/plugins/omnipath_client.py
+++ b/sos/report/plugins/omnipath_client.py
@@ -25,7 +25,7 @@ class OmnipathClient(Plugin, RedHatPlugin):
     plugin_name = 'omnipath_client'
     profiles = ('hardware',)
 
-    packages = ('opa-basic-tools')
+    packages = ('opa-basic-tools',)
 
     def setup(self):
 
diff --git a/sos/report/plugins/omnipath_manager.py b/sos/report/plugins/omnipath_manager.py
index 540b7ed8..c8ab9db7 100644
--- a/sos/report/plugins/omnipath_manager.py
+++ b/sos/report/plugins/omnipath_manager.py
@@ -24,7 +24,7 @@ class OmnipathManager(Plugin, RedHatPlugin):
     plugin_name = 'omnipath_manager'
     profiles = ('hardware',)
 
-    packages = ('opa-fm')
+    packages = ('opa-fm',)
 
     def setup(self):
 
diff --git a/sos/report/plugins/openstack_ironic.py b/sos/report/plugins/openstack_ironic.py
index 57060a27..88f00643 100644
--- a/sos/report/plugins/openstack_ironic.py
+++ b/sos/report/plugins/openstack_ironic.py
@@ -153,11 +153,7 @@ class OpenStackIronic(Plugin):
 
 class DebianIronic(OpenStackIronic, DebianPlugin, UbuntuPlugin):
 
-    packages = [
-        'ironic-api',
-        'ironic-common',
-        'ironic-conductor',
-    ]
+    packages = ('ironic-api', 'ironic-common', 'ironic-conductor')
 
     def setup(self):
         super(DebianIronic, self).setup()
diff --git a/sos/report/plugins/openstack_neutron.py b/sos/report/plugins/openstack_neutron.py
index d4616445..905d8456 100644
--- a/sos/report/plugins/openstack_neutron.py
+++ b/sos/report/plugins/openstack_neutron.py
@@ -94,7 +94,7 @@ class OpenStackNeutron(Plugin):
 
 
 class DebianNeutron(OpenStackNeutron, DebianPlugin, UbuntuPlugin):
-    packages = [
+    packages = (
         'neutron-common',
         'neutron-plugin-cisco',
         'neutron-plugin-linuxbridge-agent',
@@ -106,7 +106,7 @@ class DebianNeutron(OpenStackNeutron, DebianPlugin, UbuntuPlugin):
         'neutron-server',
         'python-neutron',
         'python-neutronclient'
-    ]
+    )
 
     def check_enabled(self):
         return self.is_installed("neutron-common")
diff --git a/sos/report/plugins/openstack_placement.py b/sos/report/plugins/openstack_placement.py
index 642b07ff..031825cf 100644
--- a/sos/report/plugins/openstack_placement.py
+++ b/sos/report/plugins/openstack_placement.py
@@ -84,7 +84,7 @@ class OpenStackPlacement(Plugin):
 
 class DebianPlacement(OpenStackPlacement, DebianPlugin, UbuntuPlugin):
 
-    packages = ('placement')
+    packages = ('placement',)
     service_name = 'placement-api'
 
     def setup(self):
@@ -97,7 +97,7 @@ class DebianPlacement(OpenStackPlacement, DebianPlugin, UbuntuPlugin):
 
 class RedHatPlacement(OpenStackPlacement, RedHatPlugin):
 
-    packages = ('openstack-selinux')
+    packages = ('openstack-selinux',)
 
     def setup(self):
         super(RedHatPlacement, self).setup()
diff --git a/sos/report/plugins/openstack_trove.py b/sos/report/plugins/openstack_trove.py
index eeb4664c..1e4a2fc3 100644
--- a/sos/report/plugins/openstack_trove.py
+++ b/sos/report/plugins/openstack_trove.py
@@ -65,12 +65,12 @@ class OpenStackTrove(Plugin):
 
 class DebianTrove(OpenStackTrove, DebianPlugin, UbuntuPlugin):
 
-    packages = [
+    packages = (
         'python-trove',
         'trove-common',
         'trove-api',
         'trove-taskmanager'
-    ]
+    )
 
     def setup(self):
         super(DebianTrove, self).setup()
diff --git a/sos/report/plugins/os_net_config.py b/sos/report/plugins/os_net_config.py
index e1332160..2970ee7e 100644
--- a/sos/report/plugins/os_net_config.py
+++ b/sos/report/plugins/os_net_config.py
@@ -14,7 +14,7 @@ class OsNetConfig(Plugin, IndependentPlugin):
     short_desc = 'OpenStack Net Config'
 
     plugin_name = "os_net_config"
-    profiles = ('openstack')
+    profiles = ('openstack',)
     packages = ('os-net-config',)
 
     def setup(self):
diff --git a/sos/report/plugins/podman.py b/sos/report/plugins/podman.py
index 93650e1e..3577f4d0 100644
--- a/sos/report/plugins/podman.py
+++ b/sos/report/plugins/podman.py
@@ -16,7 +16,7 @@ class Podman(Plugin, RedHatPlugin, UbuntuPlugin):
     short_desc = 'Podman containers'
     plugin_name = 'podman'
     profiles = ('container',)
-    packages = ('podman')
+    packages = ('podman',)
 
     option_list = [
         ("all", "enable capture for all containers, even containers "
diff --git a/sos/report/plugins/pulp.py b/sos/report/plugins/pulp.py
index 95e0a14a..4a0e70ab 100644
--- a/sos/report/plugins/pulp.py
+++ b/sos/report/plugins/pulp.py
@@ -19,7 +19,7 @@ class Pulp(Plugin, RedHatPlugin):
 
     plugin_name = "pulp"
     packages = ("pulp-server", "pulp-katello", "python3-pulpcore")
-    files = ("/etc/pulp/settings.py")
+    files = ("/etc/pulp/settings.py",)
     option_list = [
         ('tasks', 'number of tasks to collect from DB queries', 'fast', 200)
     ]
diff --git a/sos/report/plugins/sanlock.py b/sos/report/plugins/sanlock.py
index e6d2778b..d1e35940 100644
--- a/sos/report/plugins/sanlock.py
+++ b/sos/report/plugins/sanlock.py
@@ -14,7 +14,7 @@ class SANLock(Plugin):
     short_desc = 'SANlock daemon'
     plugin_name = "sanlock"
     profiles = ('cluster', 'virt')
-    packages = ["sanlock"]
+    packages = ("sanlock",)
 
     def setup(self):
         self.add_copy_spec("/var/log/sanlock.log*")
@@ -28,7 +28,7 @@ class SANLock(Plugin):
 
 class RedHatSANLock(SANLock, RedHatPlugin):
 
-    files = ["/etc/sysconfig/sanlock"]
+    files = ("/etc/sysconfig/sanlock",)
 
     def setup(self):
         super(RedHatSANLock, self).setup()
diff --git a/sos/report/plugins/sos_extras.py b/sos/report/plugins/sos_extras.py
index 7303909f..ffde4138 100644
--- a/sos/report/plugins/sos_extras.py
+++ b/sos/report/plugins/sos_extras.py
@@ -41,7 +41,7 @@ class SosExtras(Plugin, IndependentPlugin):
 
     extras_dir = '/etc/sos/extras.d/'
 
-    files = (extras_dir)
+    files = (extras_dir,)
 
     def setup(self):
         try:
diff --git a/sos/report/plugins/sudo.py b/sos/report/plugins/sudo.py
index 5ff4f0ba..2c35fc29 100644
--- a/sos/report/plugins/sudo.py
+++ b/sos/report/plugins/sudo.py
@@ -16,7 +16,7 @@ class Sudo(Plugin, IndependentPlugin):
     short_desc = 'Sudo command execution'
     plugin_name = 'sudo'
     profiles = ('identity', 'system')
-    packages = ('sudo')
+    packages = ('sudo',)
 
     def setup(self):
         self.add_copy_spec("/etc/sudo*")
diff --git a/sos/report/plugins/vhostmd.py b/sos/report/plugins/vhostmd.py
index 13378f2d..f3e9ea8f 100644
--- a/sos/report/plugins/vhostmd.py
+++ b/sos/report/plugins/vhostmd.py
@@ -15,9 +15,9 @@ class vhostmd(Plugin, RedHatPlugin):
     short_desc = 'vhostmd virtualization metrics collection'
 
     plugin_name = 'vhostmd'
-    profiles = ['sap', 'virt', 'system']
+    profiles = ('sap', 'virt', 'system')
 
-    packages = ['virt-what']
+    packages = ('virt-what',)
 
     def setup(self):
         vw = self.collect_cmd_output("virt-what")['output'].splitlines()