Code Review
/
bottlenecks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bug-fix: insecure option for quota setting
[bottlenecks.git]
/
utils
/
infra_setup
/
heat
/
common.py
diff --git
a/utils/infra_setup/heat/common.py
b/utils/infra_setup/heat/common.py
index
a0d6d83
..
f0512b0
100755
(executable)
--- a/
utils/infra_setup/heat/common.py
+++ b/
utils/infra_setup/heat/common.py
@@
-66,14
+66,16
@@
def get_session_auth():
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'):