diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2013-10-22 16:59:09 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2013-10-22 16:59:09 +0100 |
| commit | 6c5f4a906adbee9144f09bcdc6cad3bd051f4866 (patch) | |
| tree | 7bdd42ac70e6e2ed319c61f5a17bbec6db2f2fb9 | |
| parent | 79d4bfdb6b06ed7b88add2f9e39389fb708f1400 (diff) | |
| download | sos-6c5f4a906adbee9144f09bcdc6cad3bd051f4866.tar.gz | |
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 <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/openstack_keystone.py | 31 |
1 files 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): |