openstack
/
magnum
Code Issues Proposed changes

Merge "Temporarily remove dependency on package certifi"

This commit is contained in:
Jenkins 2015-09-16 15:09:52 +00:00 committed by Gerrit Code Review
parent 1c52ca8998 e75efdb31e
commit 4381c685b3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/common/pythonk8sclient/swagger_client/rest.py
View File

@ -23,7 +23,6 @@ import sys
import io import io
import json import json
import ssl import ssl
import certifi
import logging import logging
# python 2 and python 3 compatibility library # python 2 and python 3 compatibility library
@ -76,10 +75,11 @@ class RESTClientObject(object):
# https pool manager # https pool manager
# certificates validated using Mozilla’s root certificates # certificates validated using Mozilla’s root certificates
# TODO(hongbin): fix the hard-coded ca_certs path
self.ssl_pool_manager = urllib3.PoolManager( self.ssl_pool_manager = urllib3.PoolManager(
num_pools=pools_size, num_pools=pools_size,
cert_reqs=ssl.CERT_REQUIRED, cert_reqs=ssl.CERT_REQUIRED,
ca_certs=certifi.where() ca_certs='/etc/ssl/certs/ca-certificates.crt'
) )
def agent(self, url): def agent(self, url):