From 78812cea93d12a1f93a2ded27157c936ffa4e1b7 Mon Sep 17 00:00:00 2001 From: Pavel Moravec Date: Mon, 13 Mar 2017 10:56:00 +0100 Subject: [openstack_*] Implement --verify option If --verify option is set, verify openstack_* packages. Resolves: #871, #959. Signed-off-by: Pavel Moravec --- sos/plugins/openstack_ceilometer.py | 2 ++ sos/plugins/openstack_cinder.py | 2 ++ sos/plugins/openstack_glance.py | 3 +++ sos/plugins/openstack_heat.py | 3 +++ sos/plugins/openstack_horizon.py | 3 +++ sos/plugins/openstack_instack.py | 2 ++ sos/plugins/openstack_ironic.py | 3 +++ sos/plugins/openstack_keystone.py | 2 ++ sos/plugins/openstack_neutron.py | 2 ++ sos/plugins/openstack_nova.py | 3 +++ sos/plugins/openstack_sahara.py | 3 +++ sos/plugins/openstack_swift.py | 3 +++ sos/plugins/openstack_trove.py | 3 +++ 13 files changed, 34 insertions(+) diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py index 15a1b08e..fd36ee2e 100644 --- a/sos/plugins/openstack_ceilometer.py +++ b/sos/plugins/openstack_ceilometer.py @@ -38,6 +38,8 @@ class OpenStackCeilometer(Plugin): self.add_copy_spec_limit("/var/log/ceilometer/*.log", sizelimit=self.limit) self.add_copy_spec("/etc/ceilometer/") + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) def postproc(self): protect_keys = [ diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py index 7eb4ddbc..0b6768d4 100644 --- a/sos/plugins/openstack_cinder.py +++ b/sos/plugins/openstack_cinder.py @@ -45,6 +45,8 @@ class OpenStackCinder(Plugin): else: self.add_copy_spec_limit("/var/log/cinder/*.log", sizelimit=self.limit) + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) def postproc(self): protect_keys = [ diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py index ed6186a8..a6e7bffe 100644 --- a/sos/plugins/openstack_glance.py +++ b/sos/plugins/openstack_glance.py @@ -44,6 +44,9 @@ class OpenStackGlance(Plugin): self.add_copy_spec("/etc/glance/") + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) + def postproc(self): protect_keys = [ "admin_password", "password", "qpid_password", "rabbit_password", diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py index a85d4f78..a863d4ed 100644 --- a/sos/plugins/openstack_heat.py +++ b/sos/plugins/openstack_heat.py @@ -42,6 +42,9 @@ class OpenStackHeat(Plugin): self.add_copy_spec("/etc/heat/") + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) + def postproc(self): protect_keys = [ "admin_password", "memcache_secret_key", "password", "connection", diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py index f1bc68a2..ec0dcca8 100644 --- a/sos/plugins/openstack_horizon.py +++ b/sos/plugins/openstack_horizon.py @@ -41,6 +41,9 @@ class OpenStackHorizon(Plugin): self.add_copy_spec("/etc/openstack-dashboard/") self.add_forbidden_path("*.py[co]") + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) + def postproc(self): protect_keys = [ "SECRET_KEY", "EMAIL_HOST_PASSWORD" diff --git a/sos/plugins/openstack_instack.py b/sos/plugins/openstack_instack.py index e286ff05..bf70b9dc 100644 --- a/sos/plugins/openstack_instack.py +++ b/sos/plugins/openstack_instack.py @@ -27,6 +27,8 @@ class OpenStackInstack(Plugin): self.add_copy_spec("/home/stack/.instack/install-undercloud.log") 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)) def postproc(self): protected_keys = [ diff --git a/sos/plugins/openstack_ironic.py b/sos/plugins/openstack_ironic.py index b10d146d..36626a01 100644 --- a/sos/plugins/openstack_ironic.py +++ b/sos/plugins/openstack_ironic.py @@ -37,6 +37,9 @@ 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)) + def postproc(self): protect_keys = [ "dns_passkey", "memcache_secret_key", "rabbit_password", diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py index eff060b6..6aa564de 100644 --- a/sos/plugins/openstack_keystone.py +++ b/sos/plugins/openstack_keystone.py @@ -40,6 +40,8 @@ class OpenStackKeystone(Plugin): else: self.add_copy_spec_limit("/var/log/keystone/*.log", sizelimit=self.limit) + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) def postproc(self): protect_keys = [ diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py index 9e375b26..cb9b0a38 100644 --- a/sos/plugins/openstack_neutron.py +++ b/sos/plugins/openstack_neutron.py @@ -35,6 +35,8 @@ 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)) def postproc(self): protect_keys = [ diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py index e1aecb98..d4a8e940 100644 --- a/sos/plugins/openstack_nova.py +++ b/sos/plugins/openstack_nova.py @@ -77,6 +77,9 @@ class OpenStackNova(Plugin): self.add_copy_spec("/etc/nova/") + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) + def postproc(self): protect_keys = [ "ldap_dns_password", "neutron_admin_password", "rabbit_password", diff --git a/sos/plugins/openstack_sahara.py b/sos/plugins/openstack_sahara.py index b123f8bb..5fdb03fe 100644 --- a/sos/plugins/openstack_sahara.py +++ b/sos/plugins/openstack_sahara.py @@ -38,6 +38,9 @@ class OpenStackSahara(Plugin): self.add_copy_spec_limit("/var/log/sahara/*.log", sizelimit=self.limit) + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) + def postproc(self): protect_keys = [ "admin_password", "memcache_secret_key", "password", diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py index 3d38a42b..dd411414 100644 --- a/sos/plugins/openstack_swift.py +++ b/sos/plugins/openstack_swift.py @@ -39,6 +39,9 @@ class OpenStackSwift(Plugin): self.add_copy_spec("/etc/swift/") + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) + def postproc(self): protect_keys = [ "ldap_dns_password", "neutron_admin_password", "rabbit_password", diff --git a/sos/plugins/openstack_trove.py b/sos/plugins/openstack_trove.py index 549397bc..17dd3390 100644 --- a/sos/plugins/openstack_trove.py +++ b/sos/plugins/openstack_trove.py @@ -38,6 +38,9 @@ class OpenStackTrove(Plugin): self.add_copy_spec('/etc/trove/') + if self.get_option("verify"): + self.add_cmd_output("rpm -V %s" % ' '.join(packages)) + def postproc(self): protect_keys = [ -- cgit