projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix(dashboards): searches monitoring parameters through every VDU available inside...
[osm/MON.git]
/
osm_mon
/
collector
/
utils
/
openstack.py
diff --git
a/osm_mon/collector/utils/openstack.py
b/osm_mon/collector/utils/openstack.py
index
3a2b1b9
..
09c472c
100644
(file)
--- a/
osm_mon/collector/utils/openstack.py
+++ b/
osm_mon/collector/utils/openstack.py
@@
-35,7
+35,10
@@
class OpenstackUtils:
user_domain_name = 'Default'
if 'config' in creds:
vim_config = creds['config']
user_domain_name = 'Default'
if 'config' in creds:
vim_config = creds['config']
- verify_ssl = False if 'insecure' in vim_config and vim_config['insecure'] else True
+ if 'insecure' in vim_config and vim_config['insecure']:
+ verify_ssl = False
+ if 'ca_cert' in vim_config:
+ verify_ssl = vim_config['ca_cert']
if 'project_domain_name' in vim_config:
project_domain_name = vim_config['project_domain_name']
if 'user_domain_name' in vim_config:
if 'project_domain_name' in vim_config:
project_domain_name = vim_config['project_domain_name']
if 'user_domain_name' in vim_config:
@@
-46,4
+49,4
@@
class OpenstackUtils:
project_name=creds['vim_tenant_name'],
project_domain_name=project_domain_name,
user_domain_name=user_domain_name)
project_name=creds['vim_tenant_name'],
project_domain_name=project_domain_name,
user_domain_name=user_domain_name)
- return session.Session(auth=auth, verify=verify_ssl)
+ return session.Session(auth=auth, verify=verify_ssl
, timeout=10
)