From 6c5f4a906adbee9144f09bcdc6cad3bd051f4866 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Tue, 22 Oct 2013 16:59:09 +0100 Subject: Make OpenStack Keystone password removal default The keystone plug-in used a command line option to enable password removal. This should be the default behaviour - remove the option and always apply the password replacement rules. Signed-off-by: Bryn M. Reeves --- sos/plugins/openstack_keystone.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py index 96748d31..0f3b6545 100644 --- a/sos/plugins/openstack_keystone.py +++ b/sos/plugins/openstack_keystone.py @@ -37,22 +37,21 @@ class OpenStackKeystone(Plugin): self.add_copy_specs(["/var/log/keystone/"]) def postproc(self): - if self.option_enabled("nopw"): - self.do_file_sub('/etc/keystone/keystone.conf', - r"(?m)^(admin_password.*=)(.*)", - r"\1 ******") - self.do_file_sub('/etc/keystone/keystone.conf', - r"(?m)^(admin_token.*=)(.*)", - r"\1 ******") - self.do_file_sub('/etc/keystone/keystone.conf', - r"(?m)^(connection.*=.*mysql://)(.*)(:)(.*)(@)(.*)", - r"\1\2:******@\6") - self.do_file_sub('/etc/keystone/keystone.conf', - r"(?m)^(password.*=)(.*)", - r"\1 ******") - self.do_file_sub('/etc/keystone/keystone.conf', - r"(?m)^(ca_password.*=)(.*)", - r"\1 ******") + self.do_file_sub('/etc/keystone/keystone.conf', + r"(?m)^(admin_password.*=)(.*)", + r"\1 ******") + self.do_file_sub('/etc/keystone/keystone.conf', + r"(?m)^(admin_token.*=)(.*)", + r"\1 ******") + self.do_file_sub('/etc/keystone/keystone.conf', + r"(?m)^(connection.*=.*mysql://)(.*)(:)(.*)(@)(.*)", + r"\1\2:******@\6") + self.do_file_sub('/etc/keystone/keystone.conf', + r"(?m)^(password.*=)(.*)", + r"\1 ******") + self.do_file_sub('/etc/keystone/keystone.conf', + r"(?m)^(ca_password.*=)(.*)", + r"\1 ******") class DebianOpenStackKeystone(OpenStackKeystone, DebianPlugin, UbuntuPlugin): -- cgit