[openstack_*] fix issue with --verify option

If --verify option got specified, the package list was not handled
properly and resulted in trace.

Resolves: #1000.

Signed-off-by: Martin Schuppert <mschuppe@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

13 files changed, 13 insertions, 13 deletions

diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py
index 94b73b67..571723c9 100644
--- a/sos/plugins/openstack_ceilometer.py
+++ b/sos/plugins/openstack_ceilometer.py
@@ -38,7 +38,7 @@ class OpenStackCeilometer(Plugin):
                                sizelimit=self.limit)
         self.add_copy_spec("/etc/ceilometer/")
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
     def postproc(self):
         protect_keys = [
diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py
index 157f23d7..a46dd56a 100644
--- a/sos/plugins/openstack_cinder.py
+++ b/sos/plugins/openstack_cinder.py
@@ -45,7 +45,7 @@ class OpenStackCinder(Plugin):
             self.add_copy_spec("/var/log/cinder/*.log", sizelimit=self.limit)
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
     def postproc(self):
         protect_keys = [
diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py
index e18be9c9..0db5025a 100644
--- a/sos/plugins/openstack_glance.py
+++ b/sos/plugins/openstack_glance.py
@@ -45,7 +45,7 @@ class OpenStackGlance(Plugin):
         self.add_copy_spec("/etc/glance/")
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
         vars = [p in os.environ for p in [
                 'OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_NAME']]
diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py
index c002bbd2..3638aa33 100644
--- a/sos/plugins/openstack_heat.py
+++ b/sos/plugins/openstack_heat.py
@@ -52,7 +52,7 @@ class OpenStackHeat(Plugin):
         self.add_copy_spec("/etc/heat/")
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
     def postproc(self):
         protect_keys = [
diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py
index 25a9916e..88ed9102 100644
--- a/sos/plugins/openstack_horizon.py
+++ b/sos/plugins/openstack_horizon.py
@@ -40,7 +40,7 @@ class OpenStackHorizon(Plugin):
         self.add_forbidden_path("*.py[co]")
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
     def postproc(self):
         protect_keys = [
diff --git a/sos/plugins/openstack_instack.py b/sos/plugins/openstack_instack.py
index 30acecf0..3cbc008d 100644
--- a/sos/plugins/openstack_instack.py
+++ b/sos/plugins/openstack_instack.py
@@ -30,7 +30,7 @@ class OpenStackInstack(Plugin):
         self.add_copy_spec("/home/stack/instackenv.json")
         self.add_copy_spec("/home/stack/undercloud.conf")
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
diff --git a/sos/plugins/openstack_ironic.py b/sos/plugins/openstack_ironic.py
index 760ca43f..6a751244 100644
--- a/sos/plugins/openstack_ironic.py
+++ b/sos/plugins/openstack_ironic.py
@@ -38,7 +38,7 @@ class OpenStackIronic(Plugin):
         self.add_cmd_output('ls -laRt /var/lib/ironic/')
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
         vars = [p in os.environ for p in [
                 'OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_NAME']]
diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py
index ce177fbd..e7cda2fe 100644
--- a/sos/plugins/openstack_keystone.py
+++ b/sos/plugins/openstack_keystone.py
@@ -42,7 +42,7 @@ class OpenStackKeystone(Plugin):
             self.add_copy_spec("/var/log/keystone/*.log", sizelimit=self.limit)
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
         vars = [p in os.environ for p in [
                 'OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_NAME']]
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
index 590194c5..8cf73575 100644
--- a/sos/plugins/openstack_neutron.py
+++ b/sos/plugins/openstack_neutron.py
@@ -36,7 +36,7 @@ class OpenStackNeutron(Plugin):
         self.add_copy_spec("/etc/neutron/")
         self.add_copy_spec("/var/lib/neutron/")
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
         vars = [p in os.environ for p in [
                 'OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_NAME']]
diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py
index 8e0a19a1..14bdfbd5 100644
--- a/sos/plugins/openstack_nova.py
+++ b/sos/plugins/openstack_nova.py
@@ -70,7 +70,7 @@ class OpenStackNova(Plugin):
         self.add_copy_spec("/etc/nova/")
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
     def postproc(self):
         protect_keys = [
diff --git a/sos/plugins/openstack_sahara.py b/sos/plugins/openstack_sahara.py
index 5a2a5c37..cbc5bd95 100644
--- a/sos/plugins/openstack_sahara.py
+++ b/sos/plugins/openstack_sahara.py
@@ -37,7 +37,7 @@ class OpenStackSahara(Plugin):
             self.add_copy_spec("/var/log/sahara/*.log", sizelimit=self.limit)
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
     def postproc(self):
         protect_keys = [
diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py
index 1ac35091..6edc0561 100644
--- a/sos/plugins/openstack_swift.py
+++ b/sos/plugins/openstack_swift.py
@@ -38,7 +38,7 @@ class OpenStackSwift(Plugin):
         self.add_copy_spec("/etc/swift/")
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
     def postproc(self):
         protect_keys = [
diff --git a/sos/plugins/openstack_trove.py b/sos/plugins/openstack_trove.py
index e8306e51..539cbb30 100644
--- a/sos/plugins/openstack_trove.py
+++ b/sos/plugins/openstack_trove.py
@@ -37,7 +37,7 @@ class OpenStackTrove(Plugin):
         self.add_copy_spec('/etc/trove/')
 
         if self.get_option("verify"):
-            self.add_cmd_output("rpm -V %s" % ' '.join(packages))
+            self.add_cmd_output("rpm -V %s" % ' '.join(self.packages))
 
     def postproc(self):