JIRA: BOTTLENECK-240
Setting quotas will raise exception if either of insecure and
os_cacert are not set. It is not resonable.
Change-Id: Ie97f0580624a6d539e9c4cfe799714090a288487
Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
(cherry picked from commit
2822554647c906a1bdaa0b1661cbd8416e2fd7ef)
def get_session():
auth = get_session_auth()
def get_session():
auth = get_session_auth()
- try:
- cacert = os.environ['OS_CACERT']
- except KeyError:
- return session.Session(auth=auth)
- else:
- insecure = os.getenv('OS_INSECURE', '').lower() == 'true'
- cacert = False if insecure else cacert
+ if os.getenv('OS_INSECURE', '').lower() == 'true':
+ cacert = False
return session.Session(auth=auth, verify=cacert)
return session.Session(auth=auth, verify=cacert)
+ else:
+ try:
+ cacert = os.environ['OS_CACERT']
+ except KeyError:
+ return session.Session(auth=auth)
+ else:
+ return session.Session(auth=auth, verify=cacert)
def get_endpoint(service_type, endpoint_type='publicURL'):
def get_endpoint(service_type, endpoint_type='publicURL'):