diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-05-19 22:20:17 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-05-19 22:20:17 +0000 |
commit | f9d0657e70e9511a2d7b4c63bbf06b138dd0be5e (patch) | |
tree | f4e0f665e77c37c368305fe2103f45628bd5b500 /swiftclient/shell.py | |
parent | 8ffc5c11ae6e246769a15104096873ed47d535a5 (diff) | |
parent | 450f505c35f8762cca29d56b6e928490288ec166 (diff) | |
download | python-swiftclient-f9d0657e70e9511a2d7b4c63bbf06b138dd0be5e.tar.gz |
Merge "Support client certificate/key"
Diffstat (limited to 'swiftclient/shell.py')
-rwxr-xr-x | swiftclient/shell.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/swiftclient/shell.py b/swiftclient/shell.py index a422293..5eafe0b 100755 --- a/swiftclient/shell.py +++ b/swiftclient/shell.py @@ -1253,6 +1253,8 @@ def main(arguments=None): [--os-service-type <service-type>] [--os-endpoint-type <endpoint-type>] [--os-cacert <ca-certificate>] [--insecure] + [--os-cert <client-certificate-file>] + [--os-key <client-certificate-key-file>] [--no-ssl-compression] <subcommand> [--help] [<subcommand options>] @@ -1494,6 +1496,16 @@ Examples: help='Specify a CA bundle file to use in verifying a ' 'TLS (https) server certificate. ' 'Defaults to env[OS_CACERT].') + os_grp.add_argument('--os-cert', + metavar='<client-certificate-file>', + default=environ.get('OS_CERT'), + help='Specify a client certificate file (for client ' + 'auth). Defaults to env[OS_CERT].') + os_grp.add_argument('--os-key', + metavar='<client-certificate-key-file>', + default=environ.get('OS_KEY'), + help='Specify a client certificate key file (for ' + 'client auth). Defaults to env[OS_KEY].') options, args = parse_args(parser, argv[1:], enforce_requires=False) if options['help'] or options['os_help']: |