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/service.py | |
| parent | 8ffc5c11ae6e246769a15104096873ed47d535a5 (diff) | |
| parent | 450f505c35f8762cca29d56b6e928490288ec166 (diff) | |
| download | python-swiftclient-f9d0657e70e9511a2d7b4c63bbf06b138dd0be5e.tar.gz | |
Merge "Support client certificate/key"
Diffstat (limited to 'swiftclient/service.py')
| -rw-r--r-- | swiftclient/service.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/swiftclient/service.py b/swiftclient/service.py index de08090..12d3f21 100644 --- a/swiftclient/service.py +++ b/swiftclient/service.py @@ -161,6 +161,8 @@ def _build_default_global_options(): "os_service_type": environ.get('OS_SERVICE_TYPE'), "os_endpoint_type": environ.get('OS_ENDPOINT_TYPE'), "os_cacert": environ.get('OS_CACERT'), + "os_cert": environ.get('OS_CERT'), + "os_key": environ.get('OS_KEY'), "insecure": config_true_value(environ.get('SWIFTCLIENT_INSECURE')), "ssl_compression": False, 'segment_threads': 10, @@ -253,6 +255,8 @@ def get_conn(options): snet=options['snet'], cacert=options['os_cacert'], insecure=options['insecure'], + cert=options['os_cert'], + cert_key=options['os_key'], ssl_compression=options['ssl_compression']) |