diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-08 16:25:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-08 16:25:11 +0000 |
| commit | 10726437d0f047cc54bf10c2a2e9b15b5b0f66a5 (patch) | |
| tree | 607954fcd45b2e5aaa003cf3b20c2078f9f915eb /keystoneclient/auth | |
| parent | cda707f19598d05ff5c7eb5c0462f1a76389c7e6 (diff) | |
| parent | a8cca7e889a244b1bbdf90cce85fd6cb56b79a22 (diff) | |
| download | python-keystoneclient-10726437d0f047cc54bf10c2a2e9b15b5b0f66a5.tar.gz | |
Merge "Mark auth plugin options as secret"
Diffstat (limited to 'keystoneclient/auth')
| -rw-r--r-- | keystoneclient/auth/identity/v2.py | 4 | ||||
| -rw-r--r-- | keystoneclient/auth/identity/v3.py | 6 | ||||
| -rw-r--r-- | keystoneclient/auth/token_endpoint.py | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/keystoneclient/auth/identity/v2.py b/keystoneclient/auth/identity/v2.py index 72f6259..a8e7ac1 100644 --- a/keystoneclient/auth/identity/v2.py +++ b/keystoneclient/auth/identity/v2.py @@ -121,7 +121,7 @@ class Password(Auth): dest='username', deprecated_name='username', help='Username to login with'), - cfg.StrOpt('password', help='Password to use'), + cfg.StrOpt('password', secret=True, help='Password to use'), ]) return options @@ -148,7 +148,7 @@ class Token(Auth): options = super(Token, cls).get_options() options.extend([ - cfg.StrOpt('token', help='Token'), + cfg.StrOpt('token', secret=True, help='Token'), ]) return options diff --git a/keystoneclient/auth/identity/v3.py b/keystoneclient/auth/identity/v3.py index b385ba6..cd4f9c5 100644 --- a/keystoneclient/auth/identity/v3.py +++ b/keystoneclient/auth/identity/v3.py @@ -249,7 +249,7 @@ class Password(AuthConstructor): deprecated_name='username'), cfg.StrOpt('user-domain-id', help="User's domain id"), cfg.StrOpt('user-domain-name', help="User's domain name"), - cfg.StrOpt('password', help="User's password"), + cfg.StrOpt('password', secret=True, help="User's password"), ]) return options @@ -282,7 +282,9 @@ class Token(AuthConstructor): options = super(Token, cls).get_options() options.extend([ - cfg.StrOpt('token', help='Token to authenticate with'), + cfg.StrOpt('token', + secret=True, + help='Token to authenticate with'), ]) return options diff --git a/keystoneclient/auth/token_endpoint.py b/keystoneclient/auth/token_endpoint.py index 9c22d44..1f031d2 100644 --- a/keystoneclient/auth/token_endpoint.py +++ b/keystoneclient/auth/token_endpoint.py @@ -44,7 +44,9 @@ class Token(base.BaseAuthPlugin): options.extend([ cfg.StrOpt('endpoint', help='The endpoint that will always be used'), - cfg.StrOpt('token', help='The token that will always be used'), + cfg.StrOpt('token', + secret=True, + help='The token that will always be used'), ]) return options |