aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Yarwood <lyarwood@redhat.com>2015-09-25 16:31:22 +0100
committerAdam Stokes <adam.stokes@ubuntu.com>2015-09-30 13:45:14 -0400
commit4fe61508971a7d2a058ce17942994d3425bdf591 (patch)
tree53ab42c844241283b20eee10c78c9400e78dbbf3
parent14fcddf62724d0b1e45ba31f2aef0da7b794c1ed (diff)
downloadsos-4fe61508971a7d2a058ce17942994d3425bdf591.tar.gz
[openstack_horizon] Only use regex against configuration files
Ignore files from plugins such as tuskar [1] that can also be found in the `/etc/openstack-dashboard/` directory. [1] https://github.com/openstack/tuskar-ui Closes #645 Signed-off-by: Lee Yarwood <lyarwood@redhat.com> Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
-rw-r--r--sos/plugins/openstack_horizon.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py
index d514753a..af133dcd 100644
--- a/sos/plugins/openstack_horizon.py
+++ b/sos/plugins/openstack_horizon.py
@@ -39,7 +39,9 @@ class OpenStackHorizon(Plugin):
]
regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
- self.do_path_regex_sub("/etc/openstack-dashboard/*",
+ self.do_path_regex_sub("/etc/openstack-dashboard/.*\.json",
+ regexp, r"\1*********")
+ self.do_path_regex_sub("/etc/openstack-dashboard/local_settings",
regexp, r"\1*********")