|
 |
4b1b63 |
From 73524dc167179039e89a5af65f0c10c2b4fa4192 Mon Sep 17 00:00:00 2001
|
|
|
4b1b63 |
From: Jan Jansky <jjansky@redhat.com>
|
|
|
4b1b63 |
Date: Fri, 12 Mar 2021 17:40:03 +0100
|
|
|
4b1b63 |
Subject: [PATCH] [openstack_ceilometer] Add backend_url to protected keys
|
|
|
4b1b63 |
|
|
|
4b1b63 |
Backport #2298 to legacy-3.9.
|
|
|
4b1b63 |
|
|
|
4b1b63 |
Related: #2298
|
|
|
4b1b63 |
Resolves: #2448
|
|
|
4b1b63 |
|
|
|
4b1b63 |
Signed-off-by: Jan Jansky <jjansky@redhat.com>
|
|
|
4b1b63 |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
4b1b63 |
---
|
|
|
4b1b63 |
sos/plugins/openstack_ceilometer.py | 5 ++---
|
|
|
4b1b63 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
4b1b63 |
|
|
|
4b1b63 |
diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py
|
|
|
4b1b63 |
index c2f1450..a808778 100644
|
|
|
4b1b63 |
--- a/sos/plugins/openstack_ceilometer.py
|
|
|
4b1b63 |
+++ b/sos/plugins/openstack_ceilometer.py
|
|
|
4b1b63 |
@@ -50,10 +50,9 @@ class OpenStackCeilometer(Plugin):
|
|
|
4b1b63 |
"admin_password", "connection_password", "host_password",
|
|
|
4b1b63 |
"memcache_secret_key", "os_password", "password", "qpid_password",
|
|
|
4b1b63 |
"rabbit_password", "readonly_user_password", "secret_key",
|
|
|
4b1b63 |
- "ssl_key_password", "telemetry_secret", "metering_secret",
|
|
|
4b1b63 |
- "transport_url"
|
|
|
4b1b63 |
+ "ssl_key_password", "telemetry_secret", "metering_secret"
|
|
|
4b1b63 |
]
|
|
|
4b1b63 |
- connection_keys = ["connection"]
|
|
|
4b1b63 |
+ connection_keys = ["connection", "backend_url", "transport_url"]
|
|
|
4b1b63 |
|
|
|
4b1b63 |
self.apply_regex_sub(
|
|
|
4b1b63 |
r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys),
|
|
|
4b1b63 |
--
|
|
|
4b1b63 |
1.8.3.1
|
|
|
4b1b63 |
|