diff options
| -rw-r--r-- | sos/plugins/katello.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sos/plugins/katello.py b/sos/plugins/katello.py index 0794fb4c..1ea52da8 100644 --- a/sos/plugins/katello.py +++ b/sos/plugins/katello.py @@ -10,6 +10,7 @@ from sos.plugins import Plugin, RedHatPlugin from pipes import quote +import os.path class Katello(Plugin, RedHatPlugin): @@ -24,7 +25,12 @@ class Katello(Plugin, RedHatPlugin): "/var/log/httpd/katello-reverse-proxy_error_ssl.log*" ]) - cert = "/etc/pki/katello/qpid_client_striped.crt" + # certificate file location relies on katello version, it can be either + # /etc/pki/katello/qpid_client_striped.crt (for older versions) or + # /etc/pki/pulp/qpid/client.crt (for newer versions) + cert = "/etc/pki/pulp/qpid/client.crt" + if not os.path.isfile(cert): + cert = "/etc/pki/katello/qpid_client_striped.crt" self.add_cmd_output([ "qpid-stat -%s --ssl-certificate=%s -b amqps://localhost:5671" % (opt, cert) for opt in "quc" |