From 1cd7711480deae0b12792411f21831d136c61c0c Mon Sep 17 00:00:00 2001 From: Paul Peereboom Date: Wed, 4 Jul 2018 15:24:52 +0200 Subject: [plugins] Add transport_url to protected keys Signed-off-by: Paul Peereboom --- sos/plugins/openstack_ceilometer.py | 3 ++- sos/plugins/openstack_cinder.py | 2 +- sos/plugins/openstack_glance.py | 3 ++- sos/plugins/openstack_heat.py | 1 + sos/plugins/openstack_ironic.py | 2 +- sos/plugins/openstack_keystone.py | 2 +- sos/plugins/openstack_manila.py | 3 ++- sos/plugins/openstack_neutron.py | 2 +- sos/plugins/openstack_nova.py | 2 +- sos/plugins/openstack_octavia.py | 2 +- sos/plugins/openstack_sahara.py | 2 +- sos/plugins/openstack_swift.py | 2 +- sos/plugins/openstack_trove.py | 2 +- 13 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py index 9d3d6417..3bdd74c8 100644 --- a/sos/plugins/openstack_ceilometer.py +++ b/sos/plugins/openstack_ceilometer.py @@ -54,7 +54,8 @@ class OpenStackCeilometer(Plugin): "admin_password", "connection_password", "host_password", "memcache_secret_key", "os_password", "password", "qpid_password", "rabbit_password", "readonly_user_password", "secret_key", - "ssl_key_password", "telemetry_secret", "metering_secret" + "ssl_key_password", "telemetry_secret", "metering_secret", + "transport_url" ] connection_keys = ["connection"] diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py index 270fe7f9..d90cde9b 100644 --- a/sos/plugins/openstack_cinder.py +++ b/sos/plugins/openstack_cinder.py @@ -99,7 +99,7 @@ class OpenStackCinder(Plugin): "password", "qpid_password", "rabbit_password", "san_password", "ssl_key_password", "vmware_host_password", "zadara_password", "zfssa_initiator_password", "hmac_keys", "zfssa_target_password", - "os_privileged_user_password" + "os_privileged_user_password", "transport_url" ] connection_keys = ["connection"] diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py index b5fafb2c..5fcbbfd9 100644 --- a/sos/plugins/openstack_glance.py +++ b/sos/plugins/openstack_glance.py @@ -96,7 +96,8 @@ class OpenStackGlance(Plugin): def postproc(self): protect_keys = [ "admin_password", "password", "qpid_password", "rabbit_password", - "s3_store_secret_key", "ssl_key_password", "vmware_server_password" + "s3_store_secret_key", "ssl_key_password", + "vmware_server_password", "transport_url" ] connection_keys = ["connection"] diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py index 54ca22a8..c0e74202 100644 --- a/sos/plugins/openstack_heat.py +++ b/sos/plugins/openstack_heat.py @@ -118,6 +118,7 @@ class OpenStackHeat(Plugin): protect_keys = [ "admin_password", "memcache_secret_key", "password", "qpid_password", "rabbit_password", "stack_domain_admin_password", + "transport_url" ] connection_keys = ["connection"] diff --git a/sos/plugins/openstack_ironic.py b/sos/plugins/openstack_ironic.py index c14e46f9..b4cdee6d 100644 --- a/sos/plugins/openstack_ironic.py +++ b/sos/plugins/openstack_ironic.py @@ -89,7 +89,7 @@ class OpenStackIronic(Plugin): protect_keys = [ "dns_passkey", "memcache_secret_key", "rabbit_password", "password", "qpid_password", "admin_password", "ssl_key_password", - "os_password" + "os_password", "transport_url" ] connection_keys = ["connection", "sql_connection"] diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py index 35c23b0d..a6b1360f 100644 --- a/sos/plugins/openstack_keystone.py +++ b/sos/plugins/openstack_keystone.py @@ -88,7 +88,7 @@ class OpenStackKeystone(Plugin): protect_keys = [ "password", "qpid_password", "rabbit_password", "ssl_key_password", "ldap_dns_password", "neutron_admin_password", "host_password", - "admin_password", "admin_token", "ca_password" + "admin_password", "admin_token", "ca_password", "transport_url" ] connection_keys = ["connection"] diff --git a/sos/plugins/openstack_manila.py b/sos/plugins/openstack_manila.py index a9176163..ef926cda 100644 --- a/sos/plugins/openstack_manila.py +++ b/sos/plugins/openstack_manila.py @@ -54,7 +54,8 @@ class OpenStackManila(Plugin): protect_keys = [ "nova_admin_password", "rabbit_password", "qpid_password", "password", "netapp_nas_password", "cinder_admin_password", - "neutron_admin_password", "service_instance_password" + "neutron_admin_password", "service_instance_password", + "transport_url" ] connection_keys = ["connection", "sql_connection"] diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py index 1182a80d..a5134c9f 100644 --- a/sos/plugins/openstack_neutron.py +++ b/sos/plugins/openstack_neutron.py @@ -80,7 +80,7 @@ class OpenStackNeutron(Plugin): "crd_password", "primary_l3_host_password", "serverauth", "ucsm_password", "ha_vrrp_auth_password", "ssl_key_password", "nsx_password", "vcenter_password", "edge_appliance_password", - "tenant_admin_password", "apic_password" + "tenant_admin_password", "apic_password", "transport_url" ] connection_keys = ["connection"] diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py index 35eeb1bb..91f0869c 100644 --- a/sos/plugins/openstack_nova.py +++ b/sos/plugins/openstack_nova.py @@ -153,7 +153,7 @@ class OpenStackNova(Plugin): "xenapi_connection_password", "password", "host_password", "vnc_password", "admin_password", "connection_password", "memcache_secret_key", "s3_secret_key", - "metadata_proxy_shared_secret", "fixed_key" + "metadata_proxy_shared_secret", "fixed_key", "transport_url" ] connection_keys = ["connection", "sql_connection"] diff --git a/sos/plugins/openstack_octavia.py b/sos/plugins/openstack_octavia.py index 26494572..46a943a5 100644 --- a/sos/plugins/openstack_octavia.py +++ b/sos/plugins/openstack_octavia.py @@ -91,7 +91,7 @@ class OpenStackOctavia(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): def postproc(self): protect_keys = [ "ca_private_key_passphrase", "heartbeat_key", "password", - "connection" + "connection", "transport_url" ] regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys) diff --git a/sos/plugins/openstack_sahara.py b/sos/plugins/openstack_sahara.py index 0ec0dd9b..cdb4b02d 100644 --- a/sos/plugins/openstack_sahara.py +++ b/sos/plugins/openstack_sahara.py @@ -53,7 +53,7 @@ class OpenStackSahara(Plugin): protect_keys = [ "admin_password", "memcache_secret_key", "password", "qpid_password", "rabbit_password", "ssl_key_password", - "xenapi_connection_password" + "xenapi_connection_password", "transport_url" ] connection_keys = ["connection"] diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py index 939b9355..fdf101a9 100644 --- a/sos/plugins/openstack_swift.py +++ b/sos/plugins/openstack_swift.py @@ -60,7 +60,7 @@ class OpenStackSwift(Plugin): "ldap_dns_password", "neutron_admin_password", "rabbit_password", "qpid_password", "powervm_mgr_passwd", "virtual_power_host_pass", "xenapi_connection_password", "password", "host_password", - "vnc_password", "admin_password" + "vnc_password", "admin_password", "transport_url" ] connection_keys = ["connection", "sql_connection"] diff --git a/sos/plugins/openstack_trove.py b/sos/plugins/openstack_trove.py index 5ba1ee2b..6ec8aff8 100644 --- a/sos/plugins/openstack_trove.py +++ b/sos/plugins/openstack_trove.py @@ -53,7 +53,7 @@ class OpenStackTrove(Plugin): protect_keys = [ "default_password_length", "notifier_queue_password", "rabbit_password", "replication_password", "admin_password", - "dns_passkey" + "dns_passkey", "transport_url" ] connection_keys = ["connection"] -- cgit